Renamed to Cube+Transform, some refactoring done