Move files around.
Merge pull request #32 from jhorbulyk/Jacob-BuildFileHeirarchy

Move files around.
Merge branch 'master' into Jacob-CreateCategory
Move to new heirarchy.