File names change

Trying to get better organized. Renaming folders and making some style
changes. Refactoring would be the technically term.