- Renamed folders to be maven-compliant