Cleaned Folder

Folders were renamed to make them more meaningful, files were also
moved around slightly into more obvious and easier to maintain
positions (no code was modified to make use of these changes).