Sorted Dirs and Created Classes to Allow Cleaner Code (Code In Progress)