Alterations to the main class

Made some alterations to some of the classes that will suit our coding
style. I have to continue to work on the Animation class though.