diff --git a/hsfs/java/beam/pom.xml b/java/beam/pom.xml
similarity index 100%
rename from hsfs/java/beam/pom.xml
rename to java/beam/pom.xml
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureStore.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureStore.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureStore.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureStore.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureView.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureView.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureView.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/FeatureView.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/HopsworksConnection.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/HopsworksConnection.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/HopsworksConnection.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/HopsworksConnection.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/StreamFeatureGroup.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/StreamFeatureGroup.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/StreamFeatureGroup.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/StreamFeatureGroup.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/constructor/Query.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/constructor/Query.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/constructor/Query.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/constructor/Query.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamEngine.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamEngine.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamEngine.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamEngine.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamKafkaProducer.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamKafkaProducer.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamKafkaProducer.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamKafkaProducer.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamProducer.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamProducer.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamProducer.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/BeamProducer.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureGroupEngine.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureGroupEngine.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureGroupEngine.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureGroupEngine.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureViewEngine.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureViewEngine.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureViewEngine.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/FeatureViewEngine.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/GenericAvroSerializer.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/GenericAvroSerializer.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/GenericAvroSerializer.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/GenericAvroSerializer.java
diff --git a/hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/KeySerializer.java b/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/KeySerializer.java
similarity index 100%
rename from hsfs/java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/KeySerializer.java
rename to java/beam/src/main/java/com/logicalclocks/hsfs/beam/engine/KeySerializer.java
diff --git a/hsfs/java/flink/pom.xml b/java/flink/pom.xml
similarity index 100%
rename from hsfs/java/flink/pom.xml
rename to java/flink/pom.xml
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureStore.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureStore.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureStore.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureStore.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureView.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureView.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureView.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/FeatureView.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/HopsworksConnection.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/HopsworksConnection.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/HopsworksConnection.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/HopsworksConnection.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/StreamFeatureGroup.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/StreamFeatureGroup.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/StreamFeatureGroup.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/StreamFeatureGroup.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/FsQuery.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/FsQuery.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/FsQuery.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/FsQuery.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/Query.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/Query.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/Query.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/constructor/Query.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureGroupEngine.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureGroupEngine.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureGroupEngine.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureGroupEngine.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureViewEngine.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureViewEngine.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureViewEngine.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FeatureViewEngine.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FlinkEngine.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FlinkEngine.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FlinkEngine.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/FlinkEngine.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/KafkaRecordSerializer.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/KafkaRecordSerializer.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/KafkaRecordSerializer.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/KafkaRecordSerializer.java
diff --git a/hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/PojoToAvroRecord.java b/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/PojoToAvroRecord.java
similarity index 100%
rename from hsfs/java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/PojoToAvroRecord.java
rename to java/flink/src/main/java/com/logicalclocks/hsfs/flink/engine/PojoToAvroRecord.java
diff --git a/hsfs/java/hsfs/pom.xml b/java/hsfs/pom.xml
similarity index 100%
rename from hsfs/java/hsfs/pom.xml
rename to java/hsfs/pom.xml
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/DataFormat.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/DataFormat.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/DataFormat.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/DataFormat.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/DeltaStreamerJobConf.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/DeltaStreamerJobConf.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/DeltaStreamerJobConf.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/DeltaStreamerJobConf.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/EntityEndpointType.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/EntityEndpointType.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/EntityEndpointType.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/EntityEndpointType.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/ExternalDataFormat.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/ExternalDataFormat.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/ExternalDataFormat.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/ExternalDataFormat.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Feature.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/Feature.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Feature.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/Feature.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBaseForApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBaseForApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBaseForApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupBaseForApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupCommit.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupCommit.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupCommit.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureGroupCommit.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreException.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreException.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreException.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureStoreException.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureType.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureType.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureType.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureType.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureViewBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureViewBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureViewBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/FeatureViewBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/HopsworksConnectionBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/HopsworksConnectionBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/HopsworksConnectionBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/HopsworksConnectionBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/HudiOperationType.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/HudiOperationType.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/HudiOperationType.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/HudiOperationType.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/JobConfiguration.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/JobConfiguration.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/JobConfiguration.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/JobConfiguration.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Project.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/Project.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Project.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/Project.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/SecretStore.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/SecretStore.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/SecretStore.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/SecretStore.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/SecurityProtocol.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/SecurityProtocol.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/SecurityProtocol.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/SecurityProtocol.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Split.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/Split.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Split.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/Split.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/SslEndpointIdentificationAlgorithm.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/SslEndpointIdentificationAlgorithm.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/SslEndpointIdentificationAlgorithm.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/SslEndpointIdentificationAlgorithm.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/StatisticsConfig.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/StatisticsConfig.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/StatisticsConfig.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/StatisticsConfig.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Storage.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/Storage.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/Storage.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/Storage.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnector.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnector.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnector.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnector.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnectorType.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnectorType.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnectorType.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/StorageConnectorType.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TimeTravelFormat.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/TimeTravelFormat.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TimeTravelFormat.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/TimeTravelFormat.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetFeature.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetFeature.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetFeature.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetFeature.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetType.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetType.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetType.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/TrainingDatasetType.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TransformationFunction.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/TransformationFunction.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/TransformationFunction.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/TransformationFunction.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FeatureGroupAlias.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FeatureGroupAlias.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FeatureGroupAlias.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FeatureGroupAlias.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Filter.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Filter.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Filter.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Filter.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FilterLogic.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FilterLogic.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FilterLogic.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FilterLogic.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FsQueryBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FsQueryBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FsQueryBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/FsQueryBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Join.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Join.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Join.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/Join.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/JoinType.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/JoinType.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/JoinType.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/JoinType.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/PreparedStatementParameter.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/PreparedStatementParameter.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/PreparedStatementParameter.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/PreparedStatementParameter.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/QueryBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/QueryBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/QueryBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/QueryBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/ServingPreparedStatement.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/ServingPreparedStatement.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/ServingPreparedStatement.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/ServingPreparedStatement.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterCondition.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterCondition.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterCondition.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterCondition.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterLogic.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterLogic.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterLogic.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/constructor/SqlFilterLogic.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/CodeEngine.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/CodeEngine.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/CodeEngine.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/CodeEngine.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/EngineBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/EngineBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/EngineBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/EngineBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupEngineBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupEngineBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupEngineBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupEngineBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupUtils.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupUtils.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupUtils.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureGroupUtils.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureViewEngineBase.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureViewEngineBase.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureViewEngineBase.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/FeatureViewEngineBase.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/VectorServer.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/VectorServer.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/VectorServer.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/engine/VectorServer.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/AuthorizationHandler.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/AuthorizationHandler.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/AuthorizationHandler.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/AuthorizationHandler.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Code.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Code.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Code.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Code.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/CodeApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/CodeApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/CodeApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/CodeApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Credentials.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Credentials.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Credentials.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Credentials.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/DatasetApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/DatasetApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/DatasetApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/DatasetApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureDescriptiveStatistics.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureDescriptiveStatistics.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureDescriptiveStatistics.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureDescriptiveStatistics.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureGroupApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureGroupApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureGroupApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureGroupApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureStoreApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureStoreApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureStoreApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureStoreApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureViewApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureViewApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureViewApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/FeatureViewApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksClient.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksClient.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksClient.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksClient.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksExternalClient.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksExternalClient.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksExternalClient.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksExternalClient.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHostnameVerifier.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHostnameVerifier.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHostnameVerifier.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHostnameVerifier.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHttpClient.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHttpClient.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHttpClient.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHttpClient.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksInternalClient.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksInternalClient.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksInternalClient.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksInternalClient.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/InternalException.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/InternalException.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/InternalException.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/InternalException.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaClusterInfo.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaClusterInfo.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaClusterInfo.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/KafkaClusterInfo.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/OnDemandOptions.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/OnDemandOptions.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/OnDemandOptions.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/OnDemandOptions.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Option.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Option.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Option.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Option.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/ProjectApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/ProjectApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/ProjectApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/ProjectApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/QueryConstructorApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/QueryConstructorApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/QueryConstructorApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/QueryConstructorApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/RestDto.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/RestDto.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/RestDto.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/RestDto.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/SplitStatistics.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/SplitStatistics.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/SplitStatistics.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/SplitStatistics.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Statistics.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Statistics.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Statistics.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Statistics.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StatisticsApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StatisticsApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StatisticsApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StatisticsApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StorageConnectorApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StorageConnectorApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StorageConnectorApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/StorageConnectorApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Subject.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Subject.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Subject.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Subject.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Tags.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Tags.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Tags.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Tags.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TagsApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TagsApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TagsApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TagsApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TrainingDatasetApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TrainingDatasetApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TrainingDatasetApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TrainingDatasetApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TransformationFunctionAttached.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TransformationFunctionAttached.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TransformationFunctionAttached.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/TransformationFunctionAttached.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/UnauthorizedException.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/UnauthorizedException.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/UnauthorizedException.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/UnauthorizedException.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/User.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/User.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/User.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/User.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Variable.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Variable.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Variable.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/Variable.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/VariablesApi.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/VariablesApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/VariablesApi.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/VariablesApi.java
diff --git a/hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/util/Constants.java b/java/hsfs/src/main/java/com/logicalclocks/hsfs/util/Constants.java
similarity index 100%
rename from hsfs/java/hsfs/src/main/java/com/logicalclocks/hsfs/util/Constants.java
rename to java/hsfs/src/main/java/com/logicalclocks/hsfs/util/Constants.java
diff --git a/hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/TestFeatureGroupBaseForApi.java b/java/hsfs/src/test/java/com/logicalclocks/hsfs/TestFeatureGroupBaseForApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/TestFeatureGroupBaseForApi.java
rename to java/hsfs/src/test/java/com/logicalclocks/hsfs/TestFeatureGroupBaseForApi.java
diff --git a/hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/TestHopsworksExternalClient.java b/java/hsfs/src/test/java/com/logicalclocks/hsfs/TestHopsworksExternalClient.java
similarity index 100%
rename from hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/TestHopsworksExternalClient.java
rename to java/hsfs/src/test/java/com/logicalclocks/hsfs/TestHopsworksExternalClient.java
diff --git a/hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/engine/TestFeatureGroupUtils.java b/java/hsfs/src/test/java/com/logicalclocks/hsfs/engine/TestFeatureGroupUtils.java
similarity index 100%
rename from hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/engine/TestFeatureGroupUtils.java
rename to java/hsfs/src/test/java/com/logicalclocks/hsfs/engine/TestFeatureGroupUtils.java
diff --git a/hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestHopsworksClient.java b/java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestHopsworksClient.java
similarity index 100%
rename from hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestHopsworksClient.java
rename to java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestHopsworksClient.java
diff --git a/hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestTagsApi.java b/java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestTagsApi.java
similarity index 100%
rename from hsfs/java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestTagsApi.java
rename to java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestTagsApi.java
diff --git a/hsfs/java/pom.xml b/java/pom.xml
similarity index 100%
rename from hsfs/java/pom.xml
rename to java/pom.xml
diff --git a/hsfs/java/spark/pom.xml b/java/spark/pom.xml
similarity index 100%
rename from hsfs/java/spark/pom.xml
rename to java/spark/pom.xml
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/ExternalFeatureGroup.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/ExternalFeatureGroup.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/ExternalFeatureGroup.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/ExternalFeatureGroup.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureGroup.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureGroup.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureGroup.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureGroup.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureStore.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureStore.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureStore.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureStore.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureView.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureView.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureView.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/FeatureView.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/HopsworksConnection.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/HopsworksConnection.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/HopsworksConnection.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/HopsworksConnection.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/MainClass.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/MainClass.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/MainClass.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/MainClass.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/StreamFeatureGroup.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/StreamFeatureGroup.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/StreamFeatureGroup.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/StreamFeatureGroup.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDataset.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDataset.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDataset.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDataset.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDatasetBundle.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDatasetBundle.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDatasetBundle.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/TrainingDatasetBundle.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/FsQuery.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/FsQuery.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/FsQuery.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/FsQuery.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/Query.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/Query.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/Query.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/constructor/Query.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureGroupEngine.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureGroupEngine.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureGroupEngine.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureGroupEngine.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureViewEngine.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureViewEngine.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureViewEngine.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/FeatureViewEngine.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/SparkEngine.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/SparkEngine.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/SparkEngine.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/SparkEngine.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/StatisticsEngine.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/StatisticsEngine.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/StatisticsEngine.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/StatisticsEngine.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetEngine.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetEngine.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetEngine.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetEngine.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetUtils.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetUtils.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetUtils.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/TrainingDatasetUtils.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerAvroDeserializer.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerAvroDeserializer.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerAvroDeserializer.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerAvroDeserializer.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerConfig.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerConfig.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerConfig.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerConfig.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerKafkaSource.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerKafkaSource.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerKafkaSource.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerKafkaSource.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerSchemaProvider.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerSchemaProvider.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerSchemaProvider.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerSchemaProvider.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerTransformer.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerTransformer.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerTransformer.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/DeltaStreamerTransformer.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/HudiEngine.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/HudiEngine.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/HudiEngine.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/engine/hudi/HudiEngine.java
diff --git a/hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/util/StorageConnectorUtils.java b/java/spark/src/main/java/com/logicalclocks/hsfs/spark/util/StorageConnectorUtils.java
similarity index 100%
rename from hsfs/java/spark/src/main/java/com/logicalclocks/hsfs/spark/util/StorageConnectorUtils.java
rename to java/spark/src/main/java/com/logicalclocks/hsfs/spark/util/StorageConnectorUtils.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestExternalFeatureGroup.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestExternalFeatureGroup.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestExternalFeatureGroup.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestExternalFeatureGroup.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeature.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeature.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeature.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeature.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureGroup.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureGroup.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureGroup.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureGroup.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureView.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureView.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureView.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestFeatureView.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestStorageConnector.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestStorageConnector.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestStorageConnector.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/TestStorageConnector.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/constructor/TestQuery.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/constructor/TestQuery.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/constructor/TestQuery.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/constructor/TestQuery.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestFeatureViewEngine.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestFeatureViewEngine.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestFeatureViewEngine.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestFeatureViewEngine.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestHudiEngine.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestHudiEngine.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestHudiEngine.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestHudiEngine.java
diff --git a/hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestSparkEngine.java b/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestSparkEngine.java
similarity index 100%
rename from hsfs/java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestSparkEngine.java
rename to java/spark/src/test/java/com/logicalclocks/hsfs/spark/engine/TestSparkEngine.java
diff --git a/hsfs/java/spark/src/test/resources/hadoop/bin/winutils.exe b/java/spark/src/test/resources/hadoop/bin/winutils.exe
similarity index 100%
rename from hsfs/java/spark/src/test/resources/hadoop/bin/winutils.exe
rename to java/spark/src/test/resources/hadoop/bin/winutils.exe
diff --git a/hsfs/java/spark/src/test/resources/system.properties b/java/spark/src/test/resources/system.properties
similarity index 100%
rename from hsfs/java/spark/src/test/resources/system.properties
rename to java/spark/src/test/resources/system.properties
diff --git a/hsfs/java/src/main/resources/checkstyle.xml b/java/src/main/resources/checkstyle.xml
similarity index 100%
rename from hsfs/java/src/main/resources/checkstyle.xml
rename to java/src/main/resources/checkstyle.xml
diff --git a/hsfs/java/src/main/resources/suppressions.xml b/java/src/main/resources/suppressions.xml
similarity index 100%
rename from hsfs/java/src/main/resources/suppressions.xml
rename to java/src/main/resources/suppressions.xml
diff --git a/hsfs/java/src/test/resources/hadoop/bin/winutils.exe b/java/src/test/resources/hadoop/bin/winutils.exe
similarity index 100%
rename from hsfs/java/src/test/resources/hadoop/bin/winutils.exe
rename to java/src/test/resources/hadoop/bin/winutils.exe
diff --git a/hsfs/java/src/test/resources/system.properties b/java/src/test/resources/system.properties
similarity index 100%
rename from hsfs/java/src/test/resources/system.properties
rename to java/src/test/resources/system.properties