File to Folder change

Some files have been moved to some folders. Everything isn't that
cluttered anymore.