Changed project to use Maven conventions