folder restructuring and cleanup