Restructuring and pruning unused files