Moved files up to master-pom