Project File Re-organization