clean directory structure, and prepare for final push