Moving the file structure around some.
Continuing to change around file structure a little bit.