Cleanup

Directiroy cleanup and moving some things from my main project over
here.