Converted project to use Maven