Converted project to use Maven 3