Updated organization of files

Changed structure to match recommended style for new additions