Changed to build with maven