Directory restructure

I am moving some of the files around to have it mirror my development
environment.