Modified project to work with Maven