Updating pom
Re-organizings so pom is at root.