diff --git a/src/Makefile b/src/Makefile
index d248859..cab64ff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,13 +2,18 @@
 ASN1_FILES=HNBAP-CommonDataTypes.asn
 
 ASN1TOSTRUCT:=$(ASN1_ROOT)/utils/asn1tostruct.py
-#ASN1_SRCS:=$(patsubst 
 
-CFLAGS=-g -Wall `pkg-config --cflags libosmocore libosmovty libosmogsm libasn1c` -Iasn1c/
-LDFLAGS=`pkg-config --libs libosmocore libosmovty libosmogsm libasn1c` -lsctp
+PKG_INCLUDES:=$(shell pkg-config --cflags libosmocore libosmovty libosmogsm libasn1c)
+PKG_LDFLAGS:=$(shell pkg-config --libs libosmocore libosmovty libosmogsm libasn1c)
 
-RANAP_OBJS=ranap/libosmo-asn1-ranap.a #ranap_encoder.o ranap_decoder.o
-RUA_OBJS=rua/libosmo-asn1-rua.a #rua_encoder.o rua_decoder.o
+CFLAGS:=-g -Wall $(PKG_INCLUDES) -Ihnbap/
+LDFLAGS:=$(PKG_LDFLAGS) -lsctp
+
+HNBAP_OBJS=hnbap_encoder.o hnbap_decoder.o
+RANAP_OBJS=#ranap_encoder.o ranap_decoder.o
+RUA_OBJS=#rua_encoder.o rua_decoder.o
+
+LIBS=hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a ranap/libosmo-asn1-ranap.a
 
 all: hnbgw
 
@@ -32,8 +37,8 @@
 rua_common.h:
 	for f in ranap/*.h; do echo "#include \"$f\""; done > rua_common.h
 
-asn1c/libosmo-asn1-hnbap.a:
-	$(MAKE) -C asn1c
+hnbap/libosmo-asn1-hnbap.a:
+	$(MAKE) -C hnbap
 
 rua/libosmo-asn1-rua.a:
 	$(MAKE) -C rua
@@ -41,11 +46,16 @@
 ranap/libosmo-asn1-ranap.a:
 	$(MAKE) -C ranap
 
-hnbgw: asn1helpers.o hnbap_common.o hnbap_encoder.o hnbap_decoder.o hnbgw.o hnbgw_hnbap.o asn1c/libosmo-asn1-hnbap.a $(RUA_OBJS) $(RANAP_OBJS)
+hnbgw: asn1helpers.o hnbap_common.o hnbgw.o hnbgw_hnbap.o $(HNBAP_OBJS) $(RUA_OBJS) $(RANAP_OBJS) $(LIBS)
 	$(CC) $(LDFLAGS) -o $@ $^
 
 %.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $^
 
 clean:
-	@rm -f hmbgw *.o
+	@rm -f hnbgw *.o
+
+mrproper: clean
+	$(MAKE) -C hnbap clean
+	$(MAKE) -C rua clean
+	$(MAKE) -C ranap clean
diff --git a/src/asn1c/.gitignore b/src/hnbap/.gitignore
similarity index 100%
rename from src/asn1c/.gitignore
rename to src/hnbap/.gitignore
diff --git a/src/asn1c/Access-stratum-release-indicator.c b/src/hnbap/Access-stratum-release-indicator.c
similarity index 100%
rename from src/asn1c/Access-stratum-release-indicator.c
rename to src/hnbap/Access-stratum-release-indicator.c
diff --git a/src/asn1c/Access-stratum-release-indicator.h b/src/hnbap/Access-stratum-release-indicator.h
similarity index 100%
rename from src/asn1c/Access-stratum-release-indicator.h
rename to src/hnbap/Access-stratum-release-indicator.h
diff --git a/src/asn1c/AccessResult.c b/src/hnbap/AccessResult.c
similarity index 100%
rename from src/asn1c/AccessResult.c
rename to src/hnbap/AccessResult.c
diff --git a/src/asn1c/AccessResult.h b/src/hnbap/AccessResult.h
similarity index 100%
rename from src/asn1c/AccessResult.h
rename to src/hnbap/AccessResult.h
diff --git a/src/asn1c/AdditionalNeighbourInfoList.c b/src/hnbap/AdditionalNeighbourInfoList.c
similarity index 100%
rename from src/asn1c/AdditionalNeighbourInfoList.c
rename to src/hnbap/AdditionalNeighbourInfoList.c
diff --git a/src/asn1c/AdditionalNeighbourInfoList.h b/src/hnbap/AdditionalNeighbourInfoList.h
similarity index 100%
rename from src/asn1c/AdditionalNeighbourInfoList.h
rename to src/hnbap/AdditionalNeighbourInfoList.h
diff --git a/src/asn1c/AltitudeAndDirection.c b/src/hnbap/AltitudeAndDirection.c
similarity index 100%
rename from src/asn1c/AltitudeAndDirection.c
rename to src/hnbap/AltitudeAndDirection.c
diff --git a/src/asn1c/AltitudeAndDirection.h b/src/hnbap/AltitudeAndDirection.h
similarity index 100%
rename from src/asn1c/AltitudeAndDirection.h
rename to src/hnbap/AltitudeAndDirection.h
diff --git a/src/asn1c/BackoffTimer.c b/src/hnbap/BackoffTimer.c
similarity index 100%
rename from src/asn1c/BackoffTimer.c
rename to src/hnbap/BackoffTimer.c
diff --git a/src/asn1c/BackoffTimer.h b/src/hnbap/BackoffTimer.h
similarity index 100%
rename from src/asn1c/BackoffTimer.h
rename to src/hnbap/BackoffTimer.h
diff --git a/src/asn1c/BindingID.c b/src/hnbap/BindingID.c
similarity index 100%
rename from src/asn1c/BindingID.c
rename to src/hnbap/BindingID.c
diff --git a/src/asn1c/BindingID.h b/src/hnbap/BindingID.h
similarity index 100%
rename from src/asn1c/BindingID.h
rename to src/hnbap/BindingID.h
diff --git a/src/asn1c/CELL-FACHMobilitySupport.c b/src/hnbap/CELL-FACHMobilitySupport.c
similarity index 100%
rename from src/asn1c/CELL-FACHMobilitySupport.c
rename to src/hnbap/CELL-FACHMobilitySupport.c
diff --git a/src/asn1c/CELL-FACHMobilitySupport.h b/src/hnbap/CELL-FACHMobilitySupport.h
similarity index 100%
rename from src/asn1c/CELL-FACHMobilitySupport.h
rename to src/hnbap/CELL-FACHMobilitySupport.h
diff --git a/src/asn1c/CGI.c b/src/hnbap/CGI.c
similarity index 100%
rename from src/asn1c/CGI.c
rename to src/hnbap/CGI.c
diff --git a/src/asn1c/CGI.h b/src/hnbap/CGI.h
similarity index 100%
rename from src/asn1c/CGI.h
rename to src/hnbap/CGI.h
diff --git a/src/asn1c/CI.c b/src/hnbap/CI.c
similarity index 100%
rename from src/asn1c/CI.c
rename to src/hnbap/CI.c
diff --git a/src/asn1c/CI.h b/src/hnbap/CI.h
similarity index 100%
rename from src/asn1c/CI.h
rename to src/hnbap/CI.h
diff --git a/src/asn1c/CN-DomainIndicator.c b/src/hnbap/CN-DomainIndicator.c
similarity index 100%
rename from src/asn1c/CN-DomainIndicator.c
rename to src/hnbap/CN-DomainIndicator.c
diff --git a/src/asn1c/CN-DomainIndicator.h b/src/hnbap/CN-DomainIndicator.h
similarity index 100%
rename from src/asn1c/CN-DomainIndicator.h
rename to src/hnbap/CN-DomainIndicator.h
diff --git a/src/asn1c/CSG-Capability.c b/src/hnbap/CSG-Capability.c
similarity index 100%
rename from src/asn1c/CSG-Capability.c
rename to src/hnbap/CSG-Capability.c
diff --git a/src/asn1c/CSG-Capability.h b/src/hnbap/CSG-Capability.h
similarity index 100%
rename from src/asn1c/CSG-Capability.h
rename to src/hnbap/CSG-Capability.h
diff --git a/src/asn1c/CSG-ID.c b/src/hnbap/CSG-ID.c
similarity index 100%
rename from src/asn1c/CSG-ID.c
rename to src/hnbap/CSG-ID.c
diff --git a/src/asn1c/CSG-ID.h b/src/hnbap/CSG-ID.h
similarity index 100%
rename from src/asn1c/CSG-ID.h
rename to src/hnbap/CSG-ID.h
diff --git a/src/asn1c/CSGMembershipStatus.c b/src/hnbap/CSGMembershipStatus.c
similarity index 100%
rename from src/asn1c/CSGMembershipStatus.c
rename to src/hnbap/CSGMembershipStatus.c
diff --git a/src/asn1c/CSGMembershipStatus.h b/src/hnbap/CSGMembershipStatus.h
similarity index 100%
rename from src/asn1c/CSGMembershipStatus.h
rename to src/hnbap/CSGMembershipStatus.h
diff --git a/src/asn1c/CSGMembershipUpdate.c b/src/hnbap/CSGMembershipUpdate.c
similarity index 100%
rename from src/asn1c/CSGMembershipUpdate.c
rename to src/hnbap/CSGMembershipUpdate.c
diff --git a/src/asn1c/CSGMembershipUpdate.h b/src/hnbap/CSGMembershipUpdate.h
similarity index 100%
rename from src/asn1c/CSGMembershipUpdate.h
rename to src/hnbap/CSGMembershipUpdate.h
diff --git a/src/asn1c/Cause.c b/src/hnbap/Cause.c
similarity index 100%
rename from src/asn1c/Cause.c
rename to src/hnbap/Cause.c
diff --git a/src/asn1c/Cause.h b/src/hnbap/Cause.h
similarity index 100%
rename from src/asn1c/Cause.h
rename to src/hnbap/Cause.h
diff --git a/src/asn1c/CauseMisc.c b/src/hnbap/CauseMisc.c
similarity index 100%
rename from src/asn1c/CauseMisc.c
rename to src/hnbap/CauseMisc.c
diff --git a/src/asn1c/CauseMisc.h b/src/hnbap/CauseMisc.h
similarity index 100%
rename from src/asn1c/CauseMisc.h
rename to src/hnbap/CauseMisc.h
diff --git a/src/asn1c/CauseProtocol.c b/src/hnbap/CauseProtocol.c
similarity index 100%
rename from src/asn1c/CauseProtocol.c
rename to src/hnbap/CauseProtocol.c
diff --git a/src/asn1c/CauseProtocol.h b/src/hnbap/CauseProtocol.h
similarity index 100%
rename from src/asn1c/CauseProtocol.h
rename to src/hnbap/CauseProtocol.h
diff --git a/src/asn1c/CauseRadioNetwork.c b/src/hnbap/CauseRadioNetwork.c
similarity index 100%
rename from src/asn1c/CauseRadioNetwork.c
rename to src/hnbap/CauseRadioNetwork.c
diff --git a/src/asn1c/CauseRadioNetwork.h b/src/hnbap/CauseRadioNetwork.h
similarity index 100%
rename from src/asn1c/CauseRadioNetwork.h
rename to src/hnbap/CauseRadioNetwork.h
diff --git a/src/asn1c/CauseTransport.c b/src/hnbap/CauseTransport.c
similarity index 100%
rename from src/asn1c/CauseTransport.c
rename to src/hnbap/CauseTransport.c
diff --git a/src/asn1c/CauseTransport.h b/src/hnbap/CauseTransport.h
similarity index 100%
rename from src/asn1c/CauseTransport.h
rename to src/hnbap/CauseTransport.h
diff --git a/src/asn1c/CellIdentity.c b/src/hnbap/CellIdentity.c
similarity index 100%
rename from src/asn1c/CellIdentity.c
rename to src/hnbap/CellIdentity.c
diff --git a/src/asn1c/CellIdentity.h b/src/hnbap/CellIdentity.h
similarity index 100%
rename from src/asn1c/CellIdentity.h
rename to src/hnbap/CellIdentity.h
diff --git a/src/asn1c/ConfigurationInformation.c b/src/hnbap/ConfigurationInformation.c
similarity index 100%
rename from src/asn1c/ConfigurationInformation.c
rename to src/hnbap/ConfigurationInformation.c
diff --git a/src/asn1c/ConfigurationInformation.h b/src/hnbap/ConfigurationInformation.h
similarity index 100%
rename from src/asn1c/ConfigurationInformation.h
rename to src/hnbap/ConfigurationInformation.h
diff --git a/src/asn1c/Context-ID.c b/src/hnbap/Context-ID.c
similarity index 100%
rename from src/asn1c/Context-ID.c
rename to src/hnbap/Context-ID.c
diff --git a/src/asn1c/Context-ID.h b/src/hnbap/Context-ID.h
similarity index 100%
rename from src/asn1c/Context-ID.h
rename to src/hnbap/Context-ID.h
diff --git a/src/asn1c/Criticality.c b/src/hnbap/Criticality.c
similarity index 100%
rename from src/asn1c/Criticality.c
rename to src/hnbap/Criticality.c
diff --git a/src/asn1c/Criticality.h b/src/hnbap/Criticality.h
similarity index 100%
rename from src/asn1c/Criticality.h
rename to src/hnbap/Criticality.h
diff --git a/src/asn1c/CriticalityDiagnostics-IE-List.c b/src/hnbap/CriticalityDiagnostics-IE-List.c
similarity index 100%
rename from src/asn1c/CriticalityDiagnostics-IE-List.c
rename to src/hnbap/CriticalityDiagnostics-IE-List.c
diff --git a/src/asn1c/CriticalityDiagnostics-IE-List.h b/src/hnbap/CriticalityDiagnostics-IE-List.h
similarity index 100%
rename from src/asn1c/CriticalityDiagnostics-IE-List.h
rename to src/hnbap/CriticalityDiagnostics-IE-List.h
diff --git a/src/asn1c/CriticalityDiagnostics.c b/src/hnbap/CriticalityDiagnostics.c
similarity index 100%
rename from src/asn1c/CriticalityDiagnostics.c
rename to src/hnbap/CriticalityDiagnostics.c
diff --git a/src/asn1c/CriticalityDiagnostics.h b/src/hnbap/CriticalityDiagnostics.h
similarity index 100%
rename from src/asn1c/CriticalityDiagnostics.h
rename to src/hnbap/CriticalityDiagnostics.h
diff --git a/src/asn1c/ESN.c b/src/hnbap/ESN.c
similarity index 100%
rename from src/asn1c/ESN.c
rename to src/hnbap/ESN.c
diff --git a/src/asn1c/ESN.h b/src/hnbap/ESN.h
similarity index 100%
rename from src/asn1c/ESN.h
rename to src/hnbap/ESN.h
diff --git a/src/asn1c/ErrorIndication.c b/src/hnbap/ErrorIndication.c
similarity index 100%
rename from src/asn1c/ErrorIndication.c
rename to src/hnbap/ErrorIndication.c
diff --git a/src/asn1c/ErrorIndication.h b/src/hnbap/ErrorIndication.h
similarity index 100%
rename from src/asn1c/ErrorIndication.h
rename to src/hnbap/ErrorIndication.h
diff --git a/src/asn1c/GTP-TEI.c b/src/hnbap/GTP-TEI.c
similarity index 100%
rename from src/asn1c/GTP-TEI.c
rename to src/hnbap/GTP-TEI.c
diff --git a/src/asn1c/GTP-TEI.h b/src/hnbap/GTP-TEI.h
similarity index 100%
rename from src/asn1c/GTP-TEI.h
rename to src/hnbap/GTP-TEI.h
diff --git a/src/asn1c/GeographicalCoordinates.c b/src/hnbap/GeographicalCoordinates.c
similarity index 100%
rename from src/asn1c/GeographicalCoordinates.c
rename to src/hnbap/GeographicalCoordinates.c
diff --git a/src/asn1c/GeographicalCoordinates.h b/src/hnbap/GeographicalCoordinates.h
similarity index 100%
rename from src/asn1c/GeographicalCoordinates.h
rename to src/hnbap/GeographicalCoordinates.h
diff --git a/src/asn1c/GeographicalLocation.c b/src/hnbap/GeographicalLocation.c
similarity index 100%
rename from src/asn1c/GeographicalLocation.c
rename to src/hnbap/GeographicalLocation.c
diff --git a/src/asn1c/GeographicalLocation.h b/src/hnbap/GeographicalLocation.h
similarity index 100%
rename from src/asn1c/GeographicalLocation.h
rename to src/hnbap/GeographicalLocation.h
diff --git a/src/asn1c/HNB-Cell-Access-Mode.c b/src/hnbap/HNB-Cell-Access-Mode.c
similarity index 100%
rename from src/asn1c/HNB-Cell-Access-Mode.c
rename to src/hnbap/HNB-Cell-Access-Mode.c
diff --git a/src/asn1c/HNB-Cell-Access-Mode.h b/src/hnbap/HNB-Cell-Access-Mode.h
similarity index 100%
rename from src/asn1c/HNB-Cell-Access-Mode.h
rename to src/hnbap/HNB-Cell-Access-Mode.h
diff --git a/src/asn1c/HNB-Cell-Identifier.c b/src/hnbap/HNB-Cell-Identifier.c
similarity index 100%
rename from src/asn1c/HNB-Cell-Identifier.c
rename to src/hnbap/HNB-Cell-Identifier.c
diff --git a/src/asn1c/HNB-Cell-Identifier.h b/src/hnbap/HNB-Cell-Identifier.h
similarity index 100%
rename from src/asn1c/HNB-Cell-Identifier.h
rename to src/hnbap/HNB-Cell-Identifier.h
diff --git a/src/asn1c/HNB-GWResponse.c b/src/hnbap/HNB-GWResponse.c
similarity index 100%
rename from src/asn1c/HNB-GWResponse.c
rename to src/hnbap/HNB-GWResponse.c
diff --git a/src/asn1c/HNB-GWResponse.h b/src/hnbap/HNB-GWResponse.h
similarity index 100%
rename from src/asn1c/HNB-GWResponse.h
rename to src/hnbap/HNB-GWResponse.h
diff --git a/src/asn1c/HNB-Identity-Info.c b/src/hnbap/HNB-Identity-Info.c
similarity index 100%
rename from src/asn1c/HNB-Identity-Info.c
rename to src/hnbap/HNB-Identity-Info.c
diff --git a/src/asn1c/HNB-Identity-Info.h b/src/hnbap/HNB-Identity-Info.h
similarity index 100%
rename from src/asn1c/HNB-Identity-Info.h
rename to src/hnbap/HNB-Identity-Info.h
diff --git a/src/asn1c/HNB-Identity.c b/src/hnbap/HNB-Identity.c
similarity index 100%
rename from src/asn1c/HNB-Identity.c
rename to src/hnbap/HNB-Identity.c
diff --git a/src/asn1c/HNB-Identity.h b/src/hnbap/HNB-Identity.h
similarity index 100%
rename from src/asn1c/HNB-Identity.h
rename to src/hnbap/HNB-Identity.h
diff --git a/src/asn1c/HNB-Location-Information.c b/src/hnbap/HNB-Location-Information.c
similarity index 100%
rename from src/asn1c/HNB-Location-Information.c
rename to src/hnbap/HNB-Location-Information.c
diff --git a/src/asn1c/HNB-Location-Information.h b/src/hnbap/HNB-Location-Information.h
similarity index 100%
rename from src/asn1c/HNB-Location-Information.h
rename to src/hnbap/HNB-Location-Information.h
diff --git a/src/asn1c/HNB-RNL-Identity.c b/src/hnbap/HNB-RNL-Identity.c
similarity index 100%
rename from src/asn1c/HNB-RNL-Identity.c
rename to src/hnbap/HNB-RNL-Identity.c
diff --git a/src/asn1c/HNB-RNL-Identity.h b/src/hnbap/HNB-RNL-Identity.h
similarity index 100%
rename from src/asn1c/HNB-RNL-Identity.h
rename to src/hnbap/HNB-RNL-Identity.h
diff --git a/src/asn1c/HNBAP-PDU.c b/src/hnbap/HNBAP-PDU.c
similarity index 100%
rename from src/asn1c/HNBAP-PDU.c
rename to src/hnbap/HNBAP-PDU.c
diff --git a/src/asn1c/HNBAP-PDU.h b/src/hnbap/HNBAP-PDU.h
similarity index 100%
rename from src/asn1c/HNBAP-PDU.h
rename to src/hnbap/HNBAP-PDU.h
diff --git a/src/asn1c/HNBCapacity.c b/src/hnbap/HNBCapacity.c
similarity index 100%
rename from src/asn1c/HNBCapacity.c
rename to src/hnbap/HNBCapacity.c
diff --git a/src/asn1c/HNBCapacity.h b/src/hnbap/HNBCapacity.h
similarity index 100%
rename from src/asn1c/HNBCapacity.h
rename to src/hnbap/HNBCapacity.h
diff --git a/src/asn1c/HNBConfigInfo.c b/src/hnbap/HNBConfigInfo.c
similarity index 100%
rename from src/asn1c/HNBConfigInfo.c
rename to src/hnbap/HNBConfigInfo.c
diff --git a/src/asn1c/HNBConfigInfo.h b/src/hnbap/HNBConfigInfo.h
similarity index 100%
rename from src/asn1c/HNBConfigInfo.h
rename to src/hnbap/HNBConfigInfo.h
diff --git a/src/asn1c/HNBConfigTransferRequest.c b/src/hnbap/HNBConfigTransferRequest.c
similarity index 100%
rename from src/asn1c/HNBConfigTransferRequest.c
rename to src/hnbap/HNBConfigTransferRequest.c
diff --git a/src/asn1c/HNBConfigTransferRequest.h b/src/hnbap/HNBConfigTransferRequest.h
similarity index 100%
rename from src/asn1c/HNBConfigTransferRequest.h
rename to src/hnbap/HNBConfigTransferRequest.h
diff --git a/src/asn1c/HNBConfigTransferResponse.c b/src/hnbap/HNBConfigTransferResponse.c
similarity index 100%
rename from src/asn1c/HNBConfigTransferResponse.c
rename to src/hnbap/HNBConfigTransferResponse.c
diff --git a/src/asn1c/HNBConfigTransferResponse.h b/src/hnbap/HNBConfigTransferResponse.h
similarity index 100%
rename from src/asn1c/HNBConfigTransferResponse.h
rename to src/hnbap/HNBConfigTransferResponse.h
diff --git a/src/asn1c/HNBConfigurationInformationMissing.c b/src/hnbap/HNBConfigurationInformationMissing.c
similarity index 100%
rename from src/asn1c/HNBConfigurationInformationMissing.c
rename to src/hnbap/HNBConfigurationInformationMissing.c
diff --git a/src/asn1c/HNBConfigurationInformationMissing.h b/src/hnbap/HNBConfigurationInformationMissing.h
similarity index 100%
rename from src/asn1c/HNBConfigurationInformationMissing.h
rename to src/hnbap/HNBConfigurationInformationMissing.h
diff --git a/src/asn1c/HNBConfigurationInformationProvided.c b/src/hnbap/HNBConfigurationInformationProvided.c
similarity index 100%
rename from src/asn1c/HNBConfigurationInformationProvided.c
rename to src/hnbap/HNBConfigurationInformationProvided.c
diff --git a/src/asn1c/HNBConfigurationInformationProvided.h b/src/hnbap/HNBConfigurationInformationProvided.h
similarity index 100%
rename from src/asn1c/HNBConfigurationInformationProvided.h
rename to src/hnbap/HNBConfigurationInformationProvided.h
diff --git a/src/asn1c/HNBDe-Register.c b/src/hnbap/HNBDe-Register.c
similarity index 100%
rename from src/asn1c/HNBDe-Register.c
rename to src/hnbap/HNBDe-Register.c
diff --git a/src/asn1c/HNBDe-Register.h b/src/hnbap/HNBDe-Register.h
similarity index 100%
rename from src/asn1c/HNBDe-Register.h
rename to src/hnbap/HNBDe-Register.h
diff --git a/src/asn1c/HNBRegisterAccept.c b/src/hnbap/HNBRegisterAccept.c
similarity index 100%
rename from src/asn1c/HNBRegisterAccept.c
rename to src/hnbap/HNBRegisterAccept.c
diff --git a/src/asn1c/HNBRegisterAccept.h b/src/hnbap/HNBRegisterAccept.h
similarity index 100%
rename from src/asn1c/HNBRegisterAccept.h
rename to src/hnbap/HNBRegisterAccept.h
diff --git a/src/asn1c/HNBRegisterReject.c b/src/hnbap/HNBRegisterReject.c
similarity index 100%
rename from src/asn1c/HNBRegisterReject.c
rename to src/hnbap/HNBRegisterReject.c
diff --git a/src/asn1c/HNBRegisterReject.h b/src/hnbap/HNBRegisterReject.h
similarity index 100%
rename from src/asn1c/HNBRegisterReject.h
rename to src/hnbap/HNBRegisterReject.h
diff --git a/src/asn1c/HNBRegisterRequest.c b/src/hnbap/HNBRegisterRequest.c
similarity index 100%
rename from src/asn1c/HNBRegisterRequest.c
rename to src/hnbap/HNBRegisterRequest.c
diff --git a/src/asn1c/HNBRegisterRequest.h b/src/hnbap/HNBRegisterRequest.h
similarity index 100%
rename from src/asn1c/HNBRegisterRequest.h
rename to src/hnbap/HNBRegisterRequest.h
diff --git a/src/asn1c/IE-Extensions.c b/src/hnbap/IE-Extensions.c
similarity index 100%
rename from src/asn1c/IE-Extensions.c
rename to src/hnbap/IE-Extensions.c
diff --git a/src/asn1c/IE-Extensions.h b/src/hnbap/IE-Extensions.h
similarity index 100%
rename from src/asn1c/IE-Extensions.h
rename to src/hnbap/IE-Extensions.h
diff --git a/src/asn1c/IE.c b/src/hnbap/IE.c
similarity index 100%
rename from src/asn1c/IE.c
rename to src/hnbap/IE.c
diff --git a/src/asn1c/IE.h b/src/hnbap/IE.h
similarity index 100%
rename from src/asn1c/IE.h
rename to src/hnbap/IE.h
diff --git a/src/asn1c/IMEI.c b/src/hnbap/IMEI.c
similarity index 100%
rename from src/asn1c/IMEI.c
rename to src/hnbap/IMEI.c
diff --git a/src/asn1c/IMEI.h b/src/hnbap/IMEI.h
similarity index 100%
rename from src/asn1c/IMEI.h
rename to src/hnbap/IMEI.h
diff --git a/src/asn1c/IMSI.c b/src/hnbap/IMSI.c
similarity index 100%
rename from src/asn1c/IMSI.c
rename to src/hnbap/IMSI.c
diff --git a/src/asn1c/IMSI.h b/src/hnbap/IMSI.h
similarity index 100%
rename from src/asn1c/IMSI.h
rename to src/hnbap/IMSI.h
diff --git a/src/asn1c/IMSIDS41.c b/src/hnbap/IMSIDS41.c
similarity index 100%
rename from src/asn1c/IMSIDS41.c
rename to src/hnbap/IMSIDS41.c
diff --git a/src/asn1c/IMSIDS41.h b/src/hnbap/IMSIDS41.h
similarity index 100%
rename from src/asn1c/IMSIDS41.h
rename to src/hnbap/IMSIDS41.h
diff --git a/src/asn1c/IMSIESN.c b/src/hnbap/IMSIESN.c
similarity index 100%
rename from src/asn1c/IMSIESN.c
rename to src/hnbap/IMSIESN.c
diff --git a/src/asn1c/IMSIESN.h b/src/hnbap/IMSIESN.h
similarity index 100%
rename from src/asn1c/IMSIESN.h
rename to src/hnbap/IMSIESN.h
diff --git a/src/asn1c/IP-Address.c b/src/hnbap/IP-Address.c
similarity index 100%
rename from src/asn1c/IP-Address.c
rename to src/hnbap/IP-Address.c
diff --git a/src/asn1c/IP-Address.h b/src/hnbap/IP-Address.h
similarity index 100%
rename from src/asn1c/IP-Address.h
rename to src/hnbap/IP-Address.h
diff --git a/src/asn1c/InitiatingMessage.c b/src/hnbap/InitiatingMessage.c
similarity index 100%
rename from src/asn1c/InitiatingMessage.c
rename to src/hnbap/InitiatingMessage.c
diff --git a/src/asn1c/InitiatingMessage.h b/src/hnbap/InitiatingMessage.h
similarity index 100%
rename from src/asn1c/InitiatingMessage.h
rename to src/hnbap/InitiatingMessage.h
diff --git a/src/asn1c/Ipv4Address.c b/src/hnbap/Ipv4Address.c
similarity index 100%
rename from src/asn1c/Ipv4Address.c
rename to src/hnbap/Ipv4Address.c
diff --git a/src/asn1c/Ipv4Address.h b/src/hnbap/Ipv4Address.h
similarity index 100%
rename from src/asn1c/Ipv4Address.h
rename to src/hnbap/Ipv4Address.h
diff --git a/src/asn1c/Ipv6Address.c b/src/hnbap/Ipv6Address.c
similarity index 100%
rename from src/asn1c/Ipv6Address.c
rename to src/hnbap/Ipv6Address.c
diff --git a/src/asn1c/Ipv6Address.h b/src/hnbap/Ipv6Address.h
similarity index 100%
rename from src/asn1c/Ipv6Address.h
rename to src/hnbap/Ipv6Address.h
diff --git a/src/asn1c/Iurh-Signalling-TNL-AddressList.c b/src/hnbap/Iurh-Signalling-TNL-AddressList.c
similarity index 100%
rename from src/asn1c/Iurh-Signalling-TNL-AddressList.c
rename to src/hnbap/Iurh-Signalling-TNL-AddressList.c
diff --git a/src/asn1c/Iurh-Signalling-TNL-AddressList.h b/src/hnbap/Iurh-Signalling-TNL-AddressList.h
similarity index 100%
rename from src/asn1c/Iurh-Signalling-TNL-AddressList.h
rename to src/hnbap/Iurh-Signalling-TNL-AddressList.h
diff --git a/src/asn1c/LAC.c b/src/hnbap/LAC.c
similarity index 100%
rename from src/asn1c/LAC.c
rename to src/hnbap/LAC.c
diff --git a/src/asn1c/LAC.h b/src/hnbap/LAC.h
similarity index 100%
rename from src/asn1c/LAC.h
rename to src/hnbap/LAC.h
diff --git a/src/asn1c/LAI.c b/src/hnbap/LAI.c
similarity index 100%
rename from src/asn1c/LAI.c
rename to src/hnbap/LAI.c
diff --git a/src/asn1c/LAI.h b/src/hnbap/LAI.h
similarity index 100%
rename from src/asn1c/LAI.h
rename to src/hnbap/LAI.h
diff --git a/src/asn1c/MacroCellID.c b/src/hnbap/MacroCellID.c
similarity index 100%
rename from src/asn1c/MacroCellID.c
rename to src/hnbap/MacroCellID.c
diff --git a/src/asn1c/MacroCellID.h b/src/hnbap/MacroCellID.h
similarity index 100%
rename from src/asn1c/MacroCellID.h
rename to src/hnbap/MacroCellID.h
diff --git a/src/asn1c/MacroCoverageInformation.c b/src/hnbap/MacroCoverageInformation.c
similarity index 100%
rename from src/asn1c/MacroCoverageInformation.c
rename to src/hnbap/MacroCoverageInformation.c
diff --git a/src/asn1c/MacroCoverageInformation.h b/src/hnbap/MacroCoverageInformation.h
similarity index 100%
rename from src/asn1c/MacroCoverageInformation.h
rename to src/hnbap/MacroCoverageInformation.h
diff --git a/src/asn1c/Makefile.local b/src/hnbap/Makefile
similarity index 100%
rename from src/asn1c/Makefile.local
rename to src/hnbap/Makefile
diff --git a/src/asn1c/MuxPortNumber.c b/src/hnbap/MuxPortNumber.c
similarity index 100%
rename from src/asn1c/MuxPortNumber.c
rename to src/hnbap/MuxPortNumber.c
diff --git a/src/asn1c/MuxPortNumber.h b/src/hnbap/MuxPortNumber.h
similarity index 100%
rename from src/asn1c/MuxPortNumber.h
rename to src/hnbap/MuxPortNumber.h
diff --git a/src/asn1c/NeighbourCellIdentityList.c b/src/hnbap/NeighbourCellIdentityList.c
similarity index 100%
rename from src/asn1c/NeighbourCellIdentityList.c
rename to src/hnbap/NeighbourCellIdentityList.c
diff --git a/src/asn1c/NeighbourCellIdentityList.h b/src/hnbap/NeighbourCellIdentityList.h
similarity index 100%
rename from src/asn1c/NeighbourCellIdentityList.h
rename to src/hnbap/NeighbourCellIdentityList.h
diff --git a/src/asn1c/NeighbourIdentity.c b/src/hnbap/NeighbourIdentity.c
similarity index 100%
rename from src/asn1c/NeighbourIdentity.c
rename to src/hnbap/NeighbourIdentity.c
diff --git a/src/asn1c/NeighbourIdentity.h b/src/hnbap/NeighbourIdentity.h
similarity index 100%
rename from src/asn1c/NeighbourIdentity.h
rename to src/hnbap/NeighbourIdentity.h
diff --git a/src/asn1c/NeighbourInfoList.c b/src/hnbap/NeighbourInfoList.c
similarity index 100%
rename from src/asn1c/NeighbourInfoList.c
rename to src/hnbap/NeighbourInfoList.c
diff --git a/src/asn1c/NeighbourInfoList.h b/src/hnbap/NeighbourInfoList.h
similarity index 100%
rename from src/asn1c/NeighbourInfoList.h
rename to src/hnbap/NeighbourInfoList.h
diff --git a/src/asn1c/NeighbourInfoRequestItem.c b/src/hnbap/NeighbourInfoRequestItem.c
similarity index 100%
rename from src/asn1c/NeighbourInfoRequestItem.c
rename to src/hnbap/NeighbourInfoRequestItem.c
diff --git a/src/asn1c/NeighbourInfoRequestItem.h b/src/hnbap/NeighbourInfoRequestItem.h
similarity index 100%
rename from src/asn1c/NeighbourInfoRequestItem.h
rename to src/hnbap/NeighbourInfoRequestItem.h
diff --git a/src/asn1c/NeighbourInfoRequestList.c b/src/hnbap/NeighbourInfoRequestList.c
similarity index 100%
rename from src/asn1c/NeighbourInfoRequestList.c
rename to src/hnbap/NeighbourInfoRequestList.c
diff --git a/src/asn1c/NeighbourInfoRequestList.h b/src/hnbap/NeighbourInfoRequestList.h
similarity index 100%
rename from src/asn1c/NeighbourInfoRequestList.h
rename to src/hnbap/NeighbourInfoRequestList.h
diff --git a/src/asn1c/PLMNidentity.c b/src/hnbap/PLMNidentity.c
similarity index 100%
rename from src/asn1c/PLMNidentity.c
rename to src/hnbap/PLMNidentity.c
diff --git a/src/asn1c/PLMNidentity.h b/src/hnbap/PLMNidentity.h
similarity index 100%
rename from src/asn1c/PLMNidentity.h
rename to src/hnbap/PLMNidentity.h
diff --git a/src/asn1c/PSC.c b/src/hnbap/PSC.c
similarity index 100%
rename from src/asn1c/PSC.c
rename to src/hnbap/PSC.c
diff --git a/src/asn1c/PSC.h b/src/hnbap/PSC.h
similarity index 100%
rename from src/asn1c/PSC.h
rename to src/hnbap/PSC.h
diff --git a/src/asn1c/PTMSI.c b/src/hnbap/PTMSI.c
similarity index 100%
rename from src/asn1c/PTMSI.c
rename to src/hnbap/PTMSI.c
diff --git a/src/asn1c/PTMSI.h b/src/hnbap/PTMSI.h
similarity index 100%
rename from src/asn1c/PTMSI.h
rename to src/hnbap/PTMSI.h
diff --git a/src/asn1c/PTMSIRAI.c b/src/hnbap/PTMSIRAI.c
similarity index 100%
rename from src/asn1c/PTMSIRAI.c
rename to src/hnbap/PTMSIRAI.c
diff --git a/src/asn1c/PTMSIRAI.h b/src/hnbap/PTMSIRAI.h
similarity index 100%
rename from src/asn1c/PTMSIRAI.h
rename to src/hnbap/PTMSIRAI.h
diff --git a/src/asn1c/Presence.c b/src/hnbap/Presence.c
similarity index 100%
rename from src/asn1c/Presence.c
rename to src/hnbap/Presence.c
diff --git a/src/asn1c/Presence.h b/src/hnbap/Presence.h
similarity index 100%
rename from src/asn1c/Presence.h
rename to src/hnbap/Presence.h
diff --git a/src/asn1c/PrivateIE-ID.c b/src/hnbap/PrivateIE-ID.c
similarity index 100%
rename from src/asn1c/PrivateIE-ID.c
rename to src/hnbap/PrivateIE-ID.c
diff --git a/src/asn1c/PrivateIE-ID.h b/src/hnbap/PrivateIE-ID.h
similarity index 100%
rename from src/asn1c/PrivateIE-ID.h
rename to src/hnbap/PrivateIE-ID.h
diff --git a/src/asn1c/PrivateMessage.c b/src/hnbap/PrivateMessage.c
similarity index 100%
rename from src/asn1c/PrivateMessage.c
rename to src/hnbap/PrivateMessage.c
diff --git a/src/asn1c/PrivateMessage.h b/src/hnbap/PrivateMessage.h
similarity index 100%
rename from src/asn1c/PrivateMessage.h
rename to src/hnbap/PrivateMessage.h
diff --git a/src/asn1c/ProcedureCode.c b/src/hnbap/ProcedureCode.c
similarity index 100%
rename from src/asn1c/ProcedureCode.c
rename to src/hnbap/ProcedureCode.c
diff --git a/src/asn1c/ProcedureCode.h b/src/hnbap/ProcedureCode.h
similarity index 100%
rename from src/asn1c/ProcedureCode.h
rename to src/hnbap/ProcedureCode.h
diff --git a/src/asn1c/ProtocolIE-ID.c b/src/hnbap/ProtocolIE-ID.c
similarity index 100%
rename from src/asn1c/ProtocolIE-ID.c
rename to src/hnbap/ProtocolIE-ID.c
diff --git a/src/asn1c/ProtocolIE-ID.h b/src/hnbap/ProtocolIE-ID.h
similarity index 100%
rename from src/asn1c/ProtocolIE-ID.h
rename to src/hnbap/ProtocolIE-ID.h
diff --git a/src/asn1c/RAB-ID.c b/src/hnbap/RAB-ID.c
similarity index 100%
rename from src/asn1c/RAB-ID.c
rename to src/hnbap/RAB-ID.c
diff --git a/src/asn1c/RAB-ID.h b/src/hnbap/RAB-ID.h
similarity index 100%
rename from src/asn1c/RAB-ID.h
rename to src/hnbap/RAB-ID.h
diff --git a/src/asn1c/RABList.c b/src/hnbap/RABList.c
similarity index 100%
rename from src/asn1c/RABList.c
rename to src/hnbap/RABList.c
diff --git a/src/asn1c/RABList.h b/src/hnbap/RABList.h
similarity index 100%
rename from src/asn1c/RABList.h
rename to src/hnbap/RABList.h
diff --git a/src/asn1c/RABListItem.c b/src/hnbap/RABListItem.c
similarity index 100%
rename from src/asn1c/RABListItem.c
rename to src/hnbap/RABListItem.c
diff --git a/src/asn1c/RABListItem.h b/src/hnbap/RABListItem.h
similarity index 100%
rename from src/asn1c/RABListItem.h
rename to src/hnbap/RABListItem.h
diff --git a/src/asn1c/RAC.c b/src/hnbap/RAC.c
similarity index 100%
rename from src/asn1c/RAC.c
rename to src/hnbap/RAC.c
diff --git a/src/asn1c/RAC.h b/src/hnbap/RAC.h
similarity index 100%
rename from src/asn1c/RAC.h
rename to src/hnbap/RAC.h
diff --git a/src/asn1c/RAI.c b/src/hnbap/RAI.c
similarity index 100%
rename from src/asn1c/RAI.c
rename to src/hnbap/RAI.c
diff --git a/src/asn1c/RAI.h b/src/hnbap/RAI.h
similarity index 100%
rename from src/asn1c/RAI.h
rename to src/hnbap/RAI.h
diff --git a/src/asn1c/RNC-ID.c b/src/hnbap/RNC-ID.c
similarity index 100%
rename from src/asn1c/RNC-ID.c
rename to src/hnbap/RNC-ID.c
diff --git a/src/asn1c/RNC-ID.h b/src/hnbap/RNC-ID.h
similarity index 100%
rename from src/asn1c/RNC-ID.h
rename to src/hnbap/RNC-ID.h
diff --git a/src/asn1c/Registration-Cause.c b/src/hnbap/Registration-Cause.c
similarity index 100%
rename from src/asn1c/Registration-Cause.c
rename to src/hnbap/Registration-Cause.c
diff --git a/src/asn1c/Registration-Cause.h b/src/hnbap/Registration-Cause.h
similarity index 100%
rename from src/asn1c/Registration-Cause.h
rename to src/hnbap/Registration-Cause.h
diff --git a/src/asn1c/RelocationComplete.c b/src/hnbap/RelocationComplete.c
similarity index 100%
rename from src/asn1c/RelocationComplete.c
rename to src/hnbap/RelocationComplete.c
diff --git a/src/asn1c/RelocationComplete.h b/src/hnbap/RelocationComplete.h
similarity index 100%
rename from src/asn1c/RelocationComplete.h
rename to src/hnbap/RelocationComplete.h
diff --git a/src/asn1c/S-RNTIPrefix.c b/src/hnbap/S-RNTIPrefix.c
similarity index 100%
rename from src/asn1c/S-RNTIPrefix.c
rename to src/hnbap/S-RNTIPrefix.c
diff --git a/src/asn1c/S-RNTIPrefix.h b/src/hnbap/S-RNTIPrefix.h
similarity index 100%
rename from src/asn1c/S-RNTIPrefix.h
rename to src/hnbap/S-RNTIPrefix.h
diff --git a/src/asn1c/SAC.c b/src/hnbap/SAC.c
similarity index 100%
rename from src/asn1c/SAC.c
rename to src/hnbap/SAC.c
diff --git a/src/asn1c/SAC.h b/src/hnbap/SAC.h
similarity index 100%
rename from src/asn1c/SAC.h
rename to src/hnbap/SAC.h
diff --git a/src/asn1c/SuccessfulOutcome.c b/src/hnbap/SuccessfulOutcome.c
similarity index 100%
rename from src/asn1c/SuccessfulOutcome.c
rename to src/hnbap/SuccessfulOutcome.c
diff --git a/src/asn1c/SuccessfulOutcome.h b/src/hnbap/SuccessfulOutcome.h
similarity index 100%
rename from src/asn1c/SuccessfulOutcome.h
rename to src/hnbap/SuccessfulOutcome.h
diff --git a/src/asn1c/TMSIDS41.c b/src/hnbap/TMSIDS41.c
similarity index 100%
rename from src/asn1c/TMSIDS41.c
rename to src/hnbap/TMSIDS41.c
diff --git a/src/asn1c/TMSIDS41.h b/src/hnbap/TMSIDS41.h
similarity index 100%
rename from src/asn1c/TMSIDS41.h
rename to src/hnbap/TMSIDS41.h
diff --git a/src/asn1c/TMSILAI.c b/src/hnbap/TMSILAI.c
similarity index 100%
rename from src/asn1c/TMSILAI.c
rename to src/hnbap/TMSILAI.c
diff --git a/src/asn1c/TMSILAI.h b/src/hnbap/TMSILAI.h
similarity index 100%
rename from src/asn1c/TMSILAI.h
rename to src/hnbap/TMSILAI.h
diff --git a/src/asn1c/TNLUpdateFailure.c b/src/hnbap/TNLUpdateFailure.c
similarity index 100%
rename from src/asn1c/TNLUpdateFailure.c
rename to src/hnbap/TNLUpdateFailure.c
diff --git a/src/asn1c/TNLUpdateFailure.h b/src/hnbap/TNLUpdateFailure.h
similarity index 100%
rename from src/asn1c/TNLUpdateFailure.h
rename to src/hnbap/TNLUpdateFailure.h
diff --git a/src/asn1c/TNLUpdateRequest.c b/src/hnbap/TNLUpdateRequest.c
similarity index 100%
rename from src/asn1c/TNLUpdateRequest.c
rename to src/hnbap/TNLUpdateRequest.c
diff --git a/src/asn1c/TNLUpdateRequest.h b/src/hnbap/TNLUpdateRequest.h
similarity index 100%
rename from src/asn1c/TNLUpdateRequest.h
rename to src/hnbap/TNLUpdateRequest.h
diff --git a/src/asn1c/TNLUpdateResponse.c b/src/hnbap/TNLUpdateResponse.c
similarity index 100%
rename from src/asn1c/TNLUpdateResponse.c
rename to src/hnbap/TNLUpdateResponse.c
diff --git a/src/asn1c/TNLUpdateResponse.h b/src/hnbap/TNLUpdateResponse.h
similarity index 100%
rename from src/asn1c/TNLUpdateResponse.h
rename to src/hnbap/TNLUpdateResponse.h
diff --git a/src/asn1c/TransportInfo.c b/src/hnbap/TransportInfo.c
similarity index 100%
rename from src/asn1c/TransportInfo.c
rename to src/hnbap/TransportInfo.c
diff --git a/src/asn1c/TransportInfo.h b/src/hnbap/TransportInfo.h
similarity index 100%
rename from src/asn1c/TransportInfo.h
rename to src/hnbap/TransportInfo.h
diff --git a/src/asn1c/TransportLayerAddress.c b/src/hnbap/TransportLayerAddress.c
similarity index 100%
rename from src/asn1c/TransportLayerAddress.c
rename to src/hnbap/TransportLayerAddress.c
diff --git a/src/asn1c/TransportLayerAddress.h b/src/hnbap/TransportLayerAddress.h
similarity index 100%
rename from src/asn1c/TransportLayerAddress.h
rename to src/hnbap/TransportLayerAddress.h
diff --git a/src/asn1c/TriggeringMessage.c b/src/hnbap/TriggeringMessage.c
similarity index 100%
rename from src/asn1c/TriggeringMessage.c
rename to src/hnbap/TriggeringMessage.c
diff --git a/src/asn1c/TriggeringMessage.h b/src/hnbap/TriggeringMessage.h
similarity index 100%
rename from src/asn1c/TriggeringMessage.h
rename to src/hnbap/TriggeringMessage.h
diff --git a/src/asn1c/Tunnel-Information.c b/src/hnbap/Tunnel-Information.c
similarity index 100%
rename from src/asn1c/Tunnel-Information.c
rename to src/hnbap/Tunnel-Information.c
diff --git a/src/asn1c/Tunnel-Information.h b/src/hnbap/Tunnel-Information.h
similarity index 100%
rename from src/asn1c/Tunnel-Information.h
rename to src/hnbap/Tunnel-Information.h
diff --git a/src/asn1c/TypeOfError.c b/src/hnbap/TypeOfError.c
similarity index 100%
rename from src/asn1c/TypeOfError.c
rename to src/hnbap/TypeOfError.c
diff --git a/src/asn1c/TypeOfError.h b/src/hnbap/TypeOfError.h
similarity index 100%
rename from src/asn1c/TypeOfError.h
rename to src/hnbap/TypeOfError.h
diff --git a/src/asn1c/U-RNTI.c b/src/hnbap/U-RNTI.c
similarity index 100%
rename from src/asn1c/U-RNTI.c
rename to src/hnbap/U-RNTI.c
diff --git a/src/asn1c/U-RNTI.h b/src/hnbap/U-RNTI.h
similarity index 100%
rename from src/asn1c/U-RNTI.h
rename to src/hnbap/U-RNTI.h
diff --git a/src/asn1c/U-RNTIQueryRequest.c b/src/hnbap/U-RNTIQueryRequest.c
similarity index 100%
rename from src/asn1c/U-RNTIQueryRequest.c
rename to src/hnbap/U-RNTIQueryRequest.c
diff --git a/src/asn1c/U-RNTIQueryRequest.h b/src/hnbap/U-RNTIQueryRequest.h
similarity index 100%
rename from src/asn1c/U-RNTIQueryRequest.h
rename to src/hnbap/U-RNTIQueryRequest.h
diff --git a/src/asn1c/U-RNTIQueryResponse.c b/src/hnbap/U-RNTIQueryResponse.c
similarity index 100%
rename from src/asn1c/U-RNTIQueryResponse.c
rename to src/hnbap/U-RNTIQueryResponse.c
diff --git a/src/asn1c/U-RNTIQueryResponse.h b/src/hnbap/U-RNTIQueryResponse.h
similarity index 100%
rename from src/asn1c/U-RNTIQueryResponse.h
rename to src/hnbap/U-RNTIQueryResponse.h
diff --git a/src/asn1c/UDP-Port-Number.c b/src/hnbap/UDP-Port-Number.c
similarity index 100%
rename from src/asn1c/UDP-Port-Number.c
rename to src/hnbap/UDP-Port-Number.c
diff --git a/src/asn1c/UDP-Port-Number.h b/src/hnbap/UDP-Port-Number.h
similarity index 100%
rename from src/asn1c/UDP-Port-Number.h
rename to src/hnbap/UDP-Port-Number.h
diff --git a/src/asn1c/UE-Capabilities.c b/src/hnbap/UE-Capabilities.c
similarity index 100%
rename from src/asn1c/UE-Capabilities.c
rename to src/hnbap/UE-Capabilities.c
diff --git a/src/asn1c/UE-Capabilities.h b/src/hnbap/UE-Capabilities.h
similarity index 100%
rename from src/asn1c/UE-Capabilities.h
rename to src/hnbap/UE-Capabilities.h
diff --git a/src/asn1c/UE-Identity.c b/src/hnbap/UE-Identity.c
similarity index 100%
rename from src/asn1c/UE-Identity.c
rename to src/hnbap/UE-Identity.c
diff --git a/src/asn1c/UE-Identity.h b/src/hnbap/UE-Identity.h
similarity index 100%
rename from src/asn1c/UE-Identity.h
rename to src/hnbap/UE-Identity.h
diff --git a/src/asn1c/UEDe-Register.c b/src/hnbap/UEDe-Register.c
similarity index 100%
rename from src/asn1c/UEDe-Register.c
rename to src/hnbap/UEDe-Register.c
diff --git a/src/asn1c/UEDe-Register.h b/src/hnbap/UEDe-Register.h
similarity index 100%
rename from src/asn1c/UEDe-Register.h
rename to src/hnbap/UEDe-Register.h
diff --git a/src/asn1c/UERegisterAccept.c b/src/hnbap/UERegisterAccept.c
similarity index 100%
rename from src/asn1c/UERegisterAccept.c
rename to src/hnbap/UERegisterAccept.c
diff --git a/src/asn1c/UERegisterAccept.h b/src/hnbap/UERegisterAccept.h
similarity index 100%
rename from src/asn1c/UERegisterAccept.h
rename to src/hnbap/UERegisterAccept.h
diff --git a/src/asn1c/UERegisterReject.c b/src/hnbap/UERegisterReject.c
similarity index 100%
rename from src/asn1c/UERegisterReject.c
rename to src/hnbap/UERegisterReject.c
diff --git a/src/asn1c/UERegisterReject.h b/src/hnbap/UERegisterReject.h
similarity index 100%
rename from src/asn1c/UERegisterReject.h
rename to src/hnbap/UERegisterReject.h
diff --git a/src/asn1c/UERegisterRequest.c b/src/hnbap/UERegisterRequest.c
similarity index 100%
rename from src/asn1c/UERegisterRequest.c
rename to src/hnbap/UERegisterRequest.c
diff --git a/src/asn1c/UERegisterRequest.h b/src/hnbap/UERegisterRequest.h
similarity index 100%
rename from src/asn1c/UERegisterRequest.h
rename to src/hnbap/UERegisterRequest.h
diff --git a/src/asn1c/URAIdentity.c b/src/hnbap/URAIdentity.c
similarity index 100%
rename from src/asn1c/URAIdentity.c
rename to src/hnbap/URAIdentity.c
diff --git a/src/asn1c/URAIdentity.h b/src/hnbap/URAIdentity.h
similarity index 100%
rename from src/asn1c/URAIdentity.h
rename to src/hnbap/URAIdentity.h
diff --git a/src/asn1c/URAIdentityList.c b/src/hnbap/URAIdentityList.c
similarity index 100%
rename from src/asn1c/URAIdentityList.c
rename to src/hnbap/URAIdentityList.c
diff --git a/src/asn1c/URAIdentityList.h b/src/hnbap/URAIdentityList.h
similarity index 100%
rename from src/asn1c/URAIdentityList.h
rename to src/hnbap/URAIdentityList.h
diff --git a/src/asn1c/UTRANCellID.c b/src/hnbap/UTRANCellID.c
similarity index 100%
rename from src/asn1c/UTRANCellID.c
rename to src/hnbap/UTRANCellID.c
diff --git a/src/asn1c/UTRANCellID.h b/src/hnbap/UTRANCellID.h
similarity index 100%
rename from src/asn1c/UTRANCellID.h
rename to src/hnbap/UTRANCellID.h
diff --git a/src/asn1c/UnknownU-RNTIIndication.c b/src/hnbap/UnknownU-RNTIIndication.c
similarity index 100%
rename from src/asn1c/UnknownU-RNTIIndication.c
rename to src/hnbap/UnknownU-RNTIIndication.c
diff --git a/src/asn1c/UnknownU-RNTIIndication.h b/src/hnbap/UnknownU-RNTIIndication.h
similarity index 100%
rename from src/asn1c/UnknownU-RNTIIndication.h
rename to src/hnbap/UnknownU-RNTIIndication.h
diff --git a/src/asn1c/UnsuccessfulOutcome.c b/src/hnbap/UnsuccessfulOutcome.c
similarity index 100%
rename from src/asn1c/UnsuccessfulOutcome.c
rename to src/hnbap/UnsuccessfulOutcome.c
diff --git a/src/asn1c/UnsuccessfulOutcome.h b/src/hnbap/UnsuccessfulOutcome.h
similarity index 100%
rename from src/asn1c/UnsuccessfulOutcome.h
rename to src/hnbap/UnsuccessfulOutcome.h
diff --git a/src/asn1c/Update-cause.c b/src/hnbap/Update-cause.c
similarity index 100%
rename from src/asn1c/Update-cause.c
rename to src/hnbap/Update-cause.c
diff --git a/src/asn1c/Update-cause.h b/src/hnbap/Update-cause.h
similarity index 100%
rename from src/asn1c/Update-cause.h
rename to src/hnbap/Update-cause.h
diff --git a/src/ranap/Makefile b/src/ranap/Makefile
index bcd7fd1..4f84d8a 100644
--- a/src/ranap/Makefile
+++ b/src/ranap/Makefile
@@ -999,7 +999,8 @@
 libsomething_la_SOURCES=$(ASN_MODULE_SOURCES)
 
 # Remove the lines below to convert it into a pure .am file
-CFLAGS += -I. `pkg-config --cflags libasn1c`
+PKG_INCLUDES:=$(shell pkg-config --cflags libasn1c)
+CFLAGS += -I. $(PKG_INCLUDES)
 OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
 
 all: libosmo-asn1-ranap.a
diff --git a/src/rua/Makefile b/src/rua/Makefile
index c8e3471..f37a3c1 100644
--- a/src/rua/Makefile
+++ b/src/rua/Makefile
@@ -77,7 +77,8 @@
 libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
 
 # Remove the lines below to convert it into a pure .am file
-CFLAGS += -I. `pkg-config --cflags libasn1c`
+PKG_INCLUDES:=$(shell pkg-config --cflags libasn1c)
+CFLAGS += -I. $(PKG_INCLUDES)
 OBJS=${ASN_MODULE_SOURCES:.c=.o}
 
 all: libosmo-asn1-rua.a