diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000000000000000000000000000000000000..69f35ed445f52565977d7004c0e854e1cdf4ead4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+asn1/LibIts/*
+ttcn/LibCommon/*
+ttcn/LibIts/*
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index b92306c4d43c70838d5dfcec7d3e970ed3245f77..df8a5a4cc549795aa058fe866902eda701afff0b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,31 +1,3 @@
-[submodule "STF525_asn1/LibIts/CAM"]
-	path = asn1/LibIts/CAM
-	url = ../../LIBS/LibIts.git
-	branch = STF525
-[submodule "STF525_asn1/LibIts/DENM"]
-	path = asn1/LibIts/DENM
-	url = ../../LIBS/LibIts.git
-	branch = STF525
-[submodule "STF525_asn1/LibIts/ITS-Container"]
-	path = asn1/LibIts/ITS-Container
-	url = ../../LIBS/LibIts.git
-	branch = STF525
-[submodule "STF525_asn1/LibIts/EV-RSR"]
-	path = asn1/LibIts/EV-RSR
-	url = ../../LIBS/LibIts.git
-	branch = STF525
-[submodule "STF525_asn1/LibIts/EVCSN"]
-	path = asn1/LibIts/EVCSN
-	url = ../../LIBS/LibIts.git
-	branch = STF525
-[submodule "STF525_asn1/LibIts/IS"]
-	path = asn1/LibIts/IS
-	url = ../../LIBS/LibIts.git
-	branch = STF525
-[submodule "STF525_asn1/LibIts/Security"]
-	path = asn1/LibIts/Security
-	url = ../../LIBS/LibIts.git
-	branch = STF525
 [submodule "STF525_ttcn/LibIts"]
 	path = ttcn/LibIts
 	url = ../../LIBS/LibIts.git
diff --git a/asn1/LibIts/CAM b/asn1/LibIts/CAM
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/CAM
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/LibIts/DENM b/asn1/LibIts/DENM
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/DENM
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/LibIts/EV-RSR b/asn1/LibIts/EV-RSR
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/EV-RSR
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/LibIts/EVCSN b/asn1/LibIts/EVCSN
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/EVCSN
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/LibIts/IS b/asn1/LibIts/IS
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/IS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/LibIts/ITS-Container b/asn1/LibIts/ITS-Container
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/ITS-Container
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/LibIts/Security b/asn1/LibIts/Security
deleted file mode 160000
index debeafe4827781b396ee613b01eedea5ea18f991..0000000000000000000000000000000000000000
--- a/asn1/LibIts/Security
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
diff --git a/asn1/Makefile b/asn1/Makefile
index 8ddda26007baa5883052f5dadde9621e81aae905..1cfb13b5b4528e402f6e6229a22b96a3653d3ec1 100644
--- a/asn1/Makefile
+++ b/asn1/Makefile
@@ -8,26 +8,26 @@
 # The name of the library
 ASN_LIBRARY = libItsAsn.so 
 # ASN.1 files to be included in the library
-ASN_FILES = LibIts/CAM/CAM.asn \
-            LibIts/DENM/DENM.asn \
-            LibIts/IS/ETSI_TS_103301/IVIM_PDU_Descriptions.asn \
-            LibIts/IS/ETSI_TS_103301/MAPEM_PDU_Descriptions.asn \
-            LibIts/IS/ETSI_TS_103301/SPATEM_PDU_Descriptions.asn \
-            LibIts/IS/ETSI_TS_103301/SREM_PDU_Descriptions.asn \
-            LibIts/IS/ETSI_TS_103301/SSEM_PDU_Descriptions.asn \
-            LibIts/IS/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn \
-            LibIts/IS/ISO_TS_14906/EfcDsrcApplication.asn \
-            LibIts/IS/ISO_TS_14906/EfcDsrcGeneric.asn \
-            LibIts/IS/ISO_TS_17419/CITSapplMgmtIDs.asn \
-            LibIts/IS/ISO_TS_19091/original/AddGrpC.asn \
-            LibIts/IS/ISO_TS_19091/original/DSRC.asn \
-            LibIts/IS/ISO_TS_19091/original/REGION.asn \
-            LibIts/IS/ISO_TS_19321/IVI.asn \
-            LibIts/IS/ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn \
-            LibIts/ITS-Container/ITS_Container.asn \
-            LibIts/Security/1609Dot2/IEEE1609dot2.asn \
-            LibIts/Security/1609Dot2/IEEE1609dot2BaseTypes.asn \
-            LibIts/Security/EtsiTs103097Module.asn
+ASN_FILES = CAM/CAM.asn \
+            DENM/DENM.asn \
+            IS/ETSI_TS_103301/IVIM_PDU_Descriptions.asn \
+            IS/ETSI_TS_103301/MAPEM_PDU_Descriptions.asn \
+            IS/ETSI_TS_103301/SPATEM_PDU_Descriptions.asn \
+            IS/ETSI_TS_103301/SREM_PDU_Descriptions.asn \
+            IS/ETSI_TS_103301/SSEM_PDU_Descriptions.asn \
+            IS/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn \
+            IS/ISO_TS_14906/EfcDsrcApplication.asn \
+            IS/ISO_TS_14906/EfcDsrcGeneric.asn \
+            IS/ISO_TS_17419/CITSapplMgmtIDs.asn \
+            IS/ISO_TS_19091/original/AddGrpC.asn \
+            IS/ISO_TS_19091/original/DSRC.asn \
+            IS/ISO_TS_19091/original/REGION.asn \
+            IS/ISO_TS_19321/IVI.asn \
+            IS/ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn \
+            ITS-Container/ITS_Container.asn \
+            Security/1609Dot2/IEEE1609dot2.asn \
+            Security/1609Dot2/IEEE1609dot2BaseTypes.asn \
+            Security/EtsiTs103097Module.asn
 
 # PDUs
 PDU = CAM DENM MAPEM SPATEM SREM SSEM IVIM EtsiTs103097Data EtsiTs103097Certificate
@@ -45,43 +45,6 @@ ASN1C:=$(ASN1C_PATH)/asn1c/asn1c.exe -S $(ASN1C_PATH)/skeletons
 endif
 endif
 
-ifeq (,$(ASN_DIR))
-##########################################################
-# Build path for the library
-BIN_DIR := ../bin/asn1
-# Relative path from the build path to the directory with 
-# ASN.1 files
-ASN_DIR := ../../asn1
-
-.PHONY: FORCE
-
-all: $(BIN_DIR)/../$(ASN_LIBRARY)
-clean:
-	rm -rf $(BIN_DIR)
-
-$(BIN_DIR)/../$(ASN_LIBRARY): $(BIN_DIR)/Makefile
-	make -C $(BIN_DIR) all
-
-$(BIN_DIR):
-	mkdir -p $@
-
-$(BIN_DIR)/Makefile: $(BIN_DIR) Makefile
-	echo HOME=$(HOME)
-	echo ASN_DIR=$(ASN_DIR) > $@
-ifneq (, $(findstring yann,$(HOME)))
-	echo ASN1C_PATH = $(HOME)/frameworks/asn1c >> $@
-endif 
-ifneq (, $(findstring filatov,$(HOME)))
-	echo ASN1C_PATH = C:/Users/filatov/Work/asn1c >> $@
-endif
-	cat Makefile           >>$@
-
-##########################################################
-else
-##########################################################
-# This part is executed within the BIN_DIR directory to
-# override variables from the Makefile.am.libasncodec 
-# generated by asn1c
 LIB_MAKEFILE=Makefile.am.libasncodec
 include $(LIB_MAKEFILE)
 OBJS = ${ASN_MODULE_SRCS:.c=.o}
@@ -92,7 +55,7 @@ ASN_CONVERTER_SOURCES := \
 CONVERTER_OBJS=${ASN_CONVERTER_SOURCES:.c=.o}
 CFLAGS += $(ASN_MODULE_CFLAGS) -DPDU=CAM -DASN_PDU_COLLECTION -fPIC -I.
 
-all: Makefile $(CONVERTER)
+all: $(CONVERTER)
 
 $(LIB_MAKEFILE): $(addprefix $(ASN_DIR)/, $(ASN_FILES))
 	$(ASN1C) -gen-PER -gen-OER $(addprefix -pdu=,$(PDU)) -fcompound-names $^
@@ -117,8 +80,4 @@ regen: clear-asn1c $(LIB_MAKEFILE)
 clear-asn1c:
 	rm -f $(LIB_MAKEFILE)
 
-Makefile: $(ASN_DIR)/Makefile
-	echo ASN_DIR=$(ASN_DIR) > $@
-	cat $<                  >>$@
 ##########################################################
-endif