diff --git a/.cdtproject b/.cdtproject
index 8282bc0..f921c92 100644
--- a/.cdtproject
+++ b/.cdtproject
@@ -48,7 +48,7 @@
 </profile>
 </item>
 <item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path="src"/>
+<pathentry kind="src" path="libisofs"/>
 <pathentry kind="src" path="test"/>
 <pathentry kind="src" path="demo"/>
 <pathentry kind="out" path=""/>
diff --git a/.cproject b/.cproject
index 70c48d2..1f2d549 100644
--- a/.cproject
+++ b/.cproject
@@ -27,25 +27,37 @@
 </builder>
 <tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.libs.1044033465" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 <tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.1194007042" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+<option id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths.905785218" name="Undefined Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.undef.incpaths" valueType="undefIncludePath">
+<listOptionValue builtIn="false" value="/home/metalpain/Projectos/workspace/nglibisofs"/>
+<listOptionValue builtIn="false" value="/home/metalpain/Projectos/workspace/nglibisofs/src"/>
+</option>
 <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1292939907" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 </tool>
 <tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.252347798" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+<option id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths.1152034091" superClass="org.eclipse.cdt.build.core.settings.holder.undef.incpaths" valueType="undefIncludePath">
+<listOptionValue builtIn="false" value="/home/metalpain/Projectos/workspace/nglibisofs"/>
+<listOptionValue builtIn="false" value="/home/metalpain/Projectos/workspace/nglibisofs/src"/>
+</option>
 <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.420485796" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 </tool>
 <tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.2137486439" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+<option id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths.565285959" superClass="org.eclipse.cdt.build.core.settings.holder.undef.incpaths" valueType="undefIncludePath">
+<listOptionValue builtIn="false" value="/home/metalpain/Projectos/workspace/nglibisofs"/>
+<listOptionValue builtIn="false" value="/home/metalpain/Projectos/workspace/nglibisofs/src"/>
+</option>
 <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.598770298" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 </tool>
 </toolChain>
 </folderInfo>
 <sourceEntries>
-<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="libisofs"/>
 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="test"/>
 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="demo"/>
 </sourceEntries>
 </configuration>
 </storageModule>
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path="src"/>
+<pathentry kind="src" path="libisofs"/>
 <pathentry kind="src" path="test"/>
 <pathentry kind="src" path="demo"/>
 <pathentry kind="out" path=""/>
@@ -64,6 +76,9 @@
 </target>
 </buildTargets>
 </storageModule>
+
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+
 <storageModule moduleId="scannerConfiguration">
 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
 <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -146,6 +161,89 @@
 <parser enabled="false"/>
 </scannerInfoProvider>
 </profile>
+<scannerConfigBuildInfo instanceId="converted.config.2029700129.1058518760.974771800">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
 <scannerConfigBuildInfo instanceId="converted.config.2029700129">
 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
 <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
@@ -313,7 +411,6 @@
 </profile>
 </scannerConfigBuildInfo>
 </storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 </cconfiguration>
 <cconfiguration id="converted.config.2029700129.1058518760.974771800">
 <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="converted.config.2029700129.1058518760.974771800" moduleId="org.eclipse.cdt.core.settings" name="test">
@@ -350,14 +447,14 @@
 </toolChain>
 </folderInfo>
 <sourceEntries>
-<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="test"/>
 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="demo"/>
+<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="libisofs"/>
 </sourceEntries>
 </configuration>
 </storageModule>
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path="src"/>
+<pathentry kind="src" path="libisofs"/>
 <pathentry kind="src" path="test"/>
 <pathentry kind="src" path="demo"/>
 <pathentry kind="out" path=""/>
@@ -376,6 +473,9 @@
 </target>
 </buildTargets>
 </storageModule>
+
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+
 <storageModule moduleId="scannerConfiguration">
 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
 <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -458,6 +558,89 @@
 <parser enabled="false"/>
 </scannerInfoProvider>
 </profile>
+<scannerConfigBuildInfo instanceId="converted.config.2029700129.1058518760.974771800">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
 <scannerConfigBuildInfo instanceId="converted.config.2029700129">
 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
 <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
@@ -625,7 +808,6 @@
 </profile>
 </scannerConfigBuildInfo>
 </storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 </cconfiguration>
 </storageModule>
 <storageModule moduleId="cdtBuildSystem" version="4.0.0">
diff --git a/.project b/.project
index 032c04d..956535c 100644
--- a/.project
+++ b/.project
@@ -46,7 +46,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
+					<value>false</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
@@ -58,7 +58,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value>-k</value>
+					<value>check -k</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
diff --git a/Makefile.am b/Makefile.am
index 025a17b..4660a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,58 +1,58 @@
 pkgconfigdir=$(libdir)/pkgconfig
 libincludedir=$(includedir)/libisofs
 
-lib_LTLIBRARIES = src/libisofs.la
+lib_LTLIBRARIES = libisofs/libisofs.la
 
 ## ========================================================================= ##
 
 # Build libraries
 
-src_libisofs_la_LDFLAGS = \
+libisofs_libisofs_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-src_libisofs_la_SOURCES = \
-	src/builder.h \
-	src/builder.c \
-	src/error.h \
-	src/node.h \
-	src/node.c \
-	src/tree.h \
-	src/tree.c \
-	src/image.h \
-	src/image.c \
-	src/fsource.h \
-	src/fsource.c \
-	src/fs_local.c \
-	src/fs_image.c \
-	src/messages.h \
-	src/messages.c \
-	src/libiso_msgs.h \
-	src/libiso_msgs.c \
-	src/stream.h \
-	src/stream.c \
-	src/util.h \
-	src/util.c \
-	src/util_rbtree.c \
-	src/util_htable.c \
-	src/filesrc.h \
-	src/filesrc.c \
-	src/ecma119.h \
-	src/ecma119.c \
-	src/ecma119_tree.h \
-	src/ecma119_tree.c \
-	src/writer.h \
-	src/buffer.c \
-	src/rockridge.h \
-	src/rockridge.c \
-	src/rockridge_read.c \
-	src/joliet.h \
-	src/joliet.c \
-	src/eltorito.h \
-	src/eltorito.c \
-	src/iso1999.h \
-	src/iso1999.c \
-	src/data_source.c
+libisofs_libisofs_la_SOURCES = \
+	libisofs/builder.h \
+	libisofs/builder.c \
+	libisofs/error.h \
+	libisofs/node.h \
+	libisofs/node.c \
+	libisofs/tree.h \
+	libisofs/tree.c \
+	libisofs/image.h \
+	libisofs/image.c \
+	libisofs/fsource.h \
+	libisofs/fsource.c \
+	libisofs/fs_local.c \
+	libisofs/fs_image.c \
+	libisofs/messages.h \
+	libisofs/messages.c \
+	libisofs/libiso_msgs.h \
+	libisofs/libiso_msgs.c \
+	libisofs/stream.h \
+	libisofs/stream.c \
+	libisofs/util.h \
+	libisofs/util.c \
+	libisofs/util_rbtree.c \
+	libisofs/util_htable.c \
+	libisofs/filesrc.h \
+	libisofs/filesrc.c \
+	libisofs/ecma119.h \
+	libisofs/ecma119.c \
+	libisofs/ecma119_tree.h \
+	libisofs/ecma119_tree.c \
+	libisofs/writer.h \
+	libisofs/buffer.c \
+	libisofs/rockridge.h \
+	libisofs/rockridge.c \
+	libisofs/rockridge_read.c \
+	libisofs/joliet.h \
+	libisofs/joliet.c \
+	libisofs/eltorito.h \
+	libisofs/eltorito.c \
+	libisofs/iso1999.h \
+	libisofs/iso1999.c \
+	libisofs/data_source.c
 libinclude_HEADERS = \
-	src/libisofs.h
+	libisofs/libisofs.h
 
 ## ========================================================================= ##
 
@@ -70,48 +70,48 @@ noinst_PROGRAMS = \
 	demo/isoms \
 	demo/isogrow
 
-demo_lsl_CPPFLAGS = -Isrc
-demo_lsl_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_lsl_CPPFLAGS = -Ilibisofs
+demo_lsl_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_lsl_SOURCES = demo/lsl.c
 
-demo_cat_CPPFLAGS = -Isrc
-demo_cat_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_cat_CPPFLAGS = -Ilibisofs
+demo_cat_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_cat_SOURCES = demo/cat.c
 
-demo_catbuffer_CPPFLAGS = -Isrc
-demo_catbuffer_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_catbuffer_CPPFLAGS = -Ilibisofs
+demo_catbuffer_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_catbuffer_SOURCES = demo/cat_buffer.c
 
-demo_tree_CPPFLAGS = -Isrc
-demo_tree_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_tree_CPPFLAGS = -Ilibisofs
+demo_tree_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_tree_SOURCES = demo/tree.c
 
-demo_ecma119tree_CPPFLAGS = -Isrc
-demo_ecma119tree_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_ecma119tree_CPPFLAGS = -Ilibisofs
+demo_ecma119tree_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_ecma119tree_SOURCES = demo/ecma119_tree.c
 
-demo_iso_CPPFLAGS = -Isrc
-demo_iso_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_iso_CPPFLAGS = -Ilibisofs
+demo_iso_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_iso_SOURCES = demo/iso.c
 
-demo_isoread_CPPFLAGS = -Isrc
-demo_isoread_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_isoread_CPPFLAGS = -Ilibisofs
+demo_isoread_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_isoread_SOURCES = demo/iso_read.c
 
-demo_isocat_CPPFLAGS = -Isrc
-demo_isocat_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_isocat_CPPFLAGS = -Ilibisofs
+demo_isocat_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_isocat_SOURCES = demo/iso_cat.c
 
-demo_isomodify_CPPFLAGS = -Isrc
-demo_isomodify_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_isomodify_CPPFLAGS = -Ilibisofs
+demo_isomodify_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_isomodify_SOURCES = demo/iso_modify.c
 
-demo_isoms_CPPFLAGS = -Isrc
-demo_isoms_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS)
+demo_isoms_CPPFLAGS = -Ilibisofs
+demo_isoms_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS)
 demo_isoms_SOURCES = demo/iso_ms.c
 
-demo_isogrow_CPPFLAGS = -Isrc -Ilibburn
-demo_isogrow_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS) -lburn
+demo_isogrow_CPPFLAGS = -Ilibisofs -Ilibburn
+demo_isogrow_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS) -lburn
 demo_isogrow_SOURCES = demo/iso_grow.c
 
 
@@ -120,8 +120,8 @@ demo_isogrow_SOURCES = demo/iso_grow.c
 check_PROGRAMS = \
 	test/test
 	
-test_test_CPPFLAGS = -Isrc
-test_test_LDADD = $(src_libisofs_la_OBJECTS) $(THREAD_LIBS) -lcunit
+test_test_CPPFLAGS = -Ilibisofs
+test_test_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS) -lcunit
 test_test_LDFLAGS = -L.. -lm
 	
 test_test_SOURCES = \
diff --git a/src/buffer.c b/libisofs/buffer.c
similarity index 100%
rename from src/buffer.c
rename to libisofs/buffer.c
diff --git a/src/buffer.h b/libisofs/buffer.h
similarity index 100%
rename from src/buffer.h
rename to libisofs/buffer.h
diff --git a/src/builder.c b/libisofs/builder.c
similarity index 100%
rename from src/builder.c
rename to libisofs/builder.c
diff --git a/src/builder.h b/libisofs/builder.h
similarity index 100%
rename from src/builder.h
rename to libisofs/builder.h
diff --git a/src/data_source.c b/libisofs/data_source.c
similarity index 100%
rename from src/data_source.c
rename to libisofs/data_source.c
diff --git a/src/ecma119.c b/libisofs/ecma119.c
similarity index 100%
rename from src/ecma119.c
rename to libisofs/ecma119.c
diff --git a/src/ecma119.h b/libisofs/ecma119.h
similarity index 100%
rename from src/ecma119.h
rename to libisofs/ecma119.h
diff --git a/src/ecma119_tree.c b/libisofs/ecma119_tree.c
similarity index 100%
rename from src/ecma119_tree.c
rename to libisofs/ecma119_tree.c
diff --git a/src/ecma119_tree.h b/libisofs/ecma119_tree.h
similarity index 100%
rename from src/ecma119_tree.h
rename to libisofs/ecma119_tree.h
diff --git a/src/eltorito.c b/libisofs/eltorito.c
similarity index 100%
rename from src/eltorito.c
rename to libisofs/eltorito.c
diff --git a/src/eltorito.h b/libisofs/eltorito.h
similarity index 100%
rename from src/eltorito.h
rename to libisofs/eltorito.h
diff --git a/src/error.h b/libisofs/error.h
similarity index 100%
rename from src/error.h
rename to libisofs/error.h
diff --git a/src/filesrc.c b/libisofs/filesrc.c
similarity index 100%
rename from src/filesrc.c
rename to libisofs/filesrc.c
diff --git a/src/filesrc.h b/libisofs/filesrc.h
similarity index 100%
rename from src/filesrc.h
rename to libisofs/filesrc.h
diff --git a/src/fs_image.c b/libisofs/fs_image.c
similarity index 100%
rename from src/fs_image.c
rename to libisofs/fs_image.c
diff --git a/src/fs_local.c b/libisofs/fs_local.c
similarity index 100%
rename from src/fs_local.c
rename to libisofs/fs_local.c
diff --git a/src/fsource.c b/libisofs/fsource.c
similarity index 100%
rename from src/fsource.c
rename to libisofs/fsource.c
diff --git a/src/fsource.h b/libisofs/fsource.h
similarity index 100%
rename from src/fsource.h
rename to libisofs/fsource.h
diff --git a/src/image.c b/libisofs/image.c
similarity index 100%
rename from src/image.c
rename to libisofs/image.c
diff --git a/src/image.h b/libisofs/image.h
similarity index 100%
rename from src/image.h
rename to libisofs/image.h
diff --git a/src/iso1999.c b/libisofs/iso1999.c
similarity index 100%
rename from src/iso1999.c
rename to libisofs/iso1999.c
diff --git a/src/iso1999.h b/libisofs/iso1999.h
similarity index 100%
rename from src/iso1999.h
rename to libisofs/iso1999.h
diff --git a/src/joliet.c b/libisofs/joliet.c
similarity index 100%
rename from src/joliet.c
rename to libisofs/joliet.c
diff --git a/src/joliet.h b/libisofs/joliet.h
similarity index 100%
rename from src/joliet.h
rename to libisofs/joliet.h
diff --git a/src/libiso_msgs.c b/libisofs/libiso_msgs.c
similarity index 100%
rename from src/libiso_msgs.c
rename to libisofs/libiso_msgs.c
diff --git a/src/libiso_msgs.h b/libisofs/libiso_msgs.h
similarity index 100%
rename from src/libiso_msgs.h
rename to libisofs/libiso_msgs.h
diff --git a/src/libisofs.h b/libisofs/libisofs.h
similarity index 100%
rename from src/libisofs.h
rename to libisofs/libisofs.h
diff --git a/src/messages.c b/libisofs/messages.c
similarity index 100%
rename from src/messages.c
rename to libisofs/messages.c
diff --git a/src/messages.h b/libisofs/messages.h
similarity index 100%
rename from src/messages.h
rename to libisofs/messages.h
diff --git a/src/node.c b/libisofs/node.c
similarity index 100%
rename from src/node.c
rename to libisofs/node.c
diff --git a/src/node.h b/libisofs/node.h
similarity index 100%
rename from src/node.h
rename to libisofs/node.h
diff --git a/src/rockridge.c b/libisofs/rockridge.c
similarity index 100%
rename from src/rockridge.c
rename to libisofs/rockridge.c
diff --git a/src/rockridge.h b/libisofs/rockridge.h
similarity index 100%
rename from src/rockridge.h
rename to libisofs/rockridge.h
diff --git a/src/rockridge_read.c b/libisofs/rockridge_read.c
similarity index 100%
rename from src/rockridge_read.c
rename to libisofs/rockridge_read.c
diff --git a/src/stream.c b/libisofs/stream.c
similarity index 100%
rename from src/stream.c
rename to libisofs/stream.c
diff --git a/src/stream.h b/libisofs/stream.h
similarity index 100%
rename from src/stream.h
rename to libisofs/stream.h
diff --git a/src/tree.c b/libisofs/tree.c
similarity index 100%
rename from src/tree.c
rename to libisofs/tree.c
diff --git a/src/tree.h b/libisofs/tree.h
similarity index 100%
rename from src/tree.h
rename to libisofs/tree.h
diff --git a/src/util.c b/libisofs/util.c
similarity index 100%
rename from src/util.c
rename to libisofs/util.c
diff --git a/src/util.h b/libisofs/util.h
similarity index 100%
rename from src/util.h
rename to libisofs/util.h
diff --git a/src/util_htable.c b/libisofs/util_htable.c
similarity index 100%
rename from src/util_htable.c
rename to libisofs/util_htable.c
diff --git a/src/util_rbtree.c b/libisofs/util_rbtree.c
similarity index 100%
rename from src/util_rbtree.c
rename to libisofs/util_rbtree.c
diff --git a/src/writer.h b/libisofs/writer.h
similarity index 100%
rename from src/writer.h
rename to libisofs/writer.h