Reorganization in my project structure

Needed to move some things around to get a little better organized.