Renamed and fully converted to maven project