Renamed and updated files to avoid confusion with maven