Refactored project to use standard maven layout
Updated POM