Reorganize Pom File to remain consistent with other projects