Changed project to adopt Maven convention