Changes In Naming And Syntax. Removed Unused Classes.
Changes In Syntax and Naming of ID's