directory restructuring and cleanup