project cleanup and file rearrangement