clean up source tree, move files around