Changed project layout and make slight change to POM to fix Jenkins