Moved to maven
Changed to fit conventions