Fixed checkstyle issues
Renamed projects