Re-Organize the POM

Do a little bit of organization to the pom, aswell as a little more items.