Renamed classes
Changes for Maven