Moving things around trying to get organized
Rename, move, organize

Sooooo not compiling right now.