Restructuring

sreeqa77