Folder name changes

Changed the folders so we can better organize code.