cleanup
refactoring
phase 1 redirects complete
Merge pull request #4 from CrackerJackMack/restructure

Restructure