restructuring filesystem