Restructured to Remove Classes Folder

-Minor code consistency fix