General clean up. Get the proposed file structure in place.