moved build to maven and folder organization