Re-organized sources
Organized POM