Changes...

I have started doing some changes here. Will continue to do so in the next few weeks...