Cleaning up directory structure for clean push to git.