Rename & move some files

This cleans up things by moving things around and renaming some files that had same name across the repo