Cleanup

- try for filestructure naming consistency between repos
- whitespace (loving the new vimrc)
- a little readability and logic