Renaming and Reorg of files

renaming the files and moving some around for better organization.