Refactored classes into their own folders