Refactorings

This cleans up things by moving things around and renaming some files that had same name across the repo. I had to add .gitattributes also, otherwise most of the changes looked like I had change whole file.