cleaned up

cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache

@@ -90,8 +90,8 @@ sstream
 config.h
 /home/phanes/Development/internal/ftests/src/json/config.h
 
-/home/phanes/Development/internal/ftests/src/jsoncpp.cpp
-json/json.h
+/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp
+json.h
 /home/phanes/Development/internal/ftests/src/json/json.h
 clocale
 -
@@ -102,7 +102,7 @@ json/reader.h
 json/value.h
 -
 json_tool.h
-/home/phanes/Development/internal/ftests/src/json_tool.h
+/home/phanes/Development/internal/ftests/src/json/json_tool.h
 utility
 -
 cstdio
@@ -144,11 +144,11 @@ cstddef
 algorithm
 -
 json_valueiterator.inl
-/home/phanes/Development/internal/ftests/src/json_valueiterator.inl
+/home/phanes/Development/internal/ftests/src/json/json_valueiterator.inl
 json/writer.h
 -
 json_tool.h
-/home/phanes/Development/internal/ftests/src/json_tool.h
+/home/phanes/Development/internal/ftests/src/json/json_tool.h
 iomanip
 -
 memory

cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake

@@ -5,7 +5,7 @@ set(CMAKE_DEPENDS_LANGUAGES
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
   "/home/phanes/Development/internal/ftests/examplar.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o"
-  "/home/phanes/Development/internal/ftests/src/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/jsoncpp.cpp.o"
+  "/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
   "/home/phanes/Development/internal/ftests/src/loaders.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")

cmake-build-debug/CMakeFiles/ftests.dir/build.make

@@ -105,42 +105,42 @@ CMakeFiles/ftests.dir/src/loaders.cpp.o.provides: CMakeFiles/ftests.dir/src/load
 CMakeFiles/ftests.dir/src/loaders.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders.cpp.o
 
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o: CMakeFiles/ftests.dir/flags.make
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o: ../src/jsoncpp.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object CMakeFiles/ftests.dir/src/jsoncpp.cpp.o"
-	/usr/bin/c++   $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/jsoncpp.cpp.o -c /home/phanes/Development/internal/ftests/src/jsoncpp.cpp
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/jsoncpp.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
+	/usr/bin/c++   $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o -c /home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/jsoncpp.cpp.i"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/jsoncpp.cpp > CMakeFiles/ftests.dir/src/jsoncpp.cpp.i
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.i"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp > CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.i
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/jsoncpp.cpp.s"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/jsoncpp.cpp -o CMakeFiles/ftests.dir/src/jsoncpp.cpp.s
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.s"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp -o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.s
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.requires:
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires:
 
-.PHONY : CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.requires
+.PHONY : CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.provides: CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.requires
-	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.provides.build
-.PHONY : CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.provides
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires
+	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/src/jsoncpp.cpp.o
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
 
 
 # Object files for target ftests
 ftests_OBJECTS = \
 "CMakeFiles/ftests.dir/examplar.cpp.o" \
 "CMakeFiles/ftests.dir/src/loaders.cpp.o" \
-"CMakeFiles/ftests.dir/src/jsoncpp.cpp.o"
+"CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
 
 # External object files for target ftests
 ftests_EXTERNAL_OBJECTS =
 
 ftests: CMakeFiles/ftests.dir/examplar.cpp.o
 ftests: CMakeFiles/ftests.dir/src/loaders.cpp.o
-ftests: CMakeFiles/ftests.dir/src/jsoncpp.cpp.o
+ftests: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
 ftests: CMakeFiles/ftests.dir/build.make
 ftests: CMakeFiles/ftests.dir/link.txt
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking CXX executable ftests"
@@ -153,7 +153,7 @@ CMakeFiles/ftests.dir/build: ftests
 
 CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/examplar.cpp.o.requires
 CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders.cpp.o.requires
-CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires
 
 .PHONY : CMakeFiles/ftests.dir/requires
 

cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake

@@ -1,7 +1,7 @@
 file(REMOVE_RECURSE
   "CMakeFiles/ftests.dir/examplar.cpp.o"
   "CMakeFiles/ftests.dir/src/loaders.cpp.o"
-  "CMakeFiles/ftests.dir/src/jsoncpp.cpp.o"
+  "CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
   "ftests.pdb"
   "ftests"
 )

cmake-build-debug/CMakeFiles/ftests.dir/depend.internal

@@ -6,9 +6,9 @@ CMakeFiles/ftests.dir/examplar.cpp.o
  /home/phanes/Development/internal/ftests/src/json/json-forwards.h
  /home/phanes/Development/internal/ftests/src/json/json.h
  /home/phanes/Development/internal/ftests/src/loaders.h
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
  /home/phanes/Development/internal/ftests/src/json/json.h
- /home/phanes/Development/internal/ftests/src/jsoncpp.cpp
+ /home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp
 CMakeFiles/ftests.dir/src/loaders.cpp.o
  /home/phanes/Development/internal/ftests/src/json/json-forwards.h
  /home/phanes/Development/internal/ftests/src/json/json.h

cmake-build-debug/CMakeFiles/ftests.dir/depend.make

@@ -6,8 +6,8 @@ CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json-forwards.h
 CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json.h
 CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders.h
 
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o: ../src/json/json.h
-CMakeFiles/ftests.dir/src/jsoncpp.cpp.o: ../src/jsoncpp.cpp
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/json.h
+CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/jsoncpp.cpp
 
 CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/json/json-forwards.h
 CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/json/json.h

cmake-build-debug/CMakeFiles/ftests.dir/link.txt

@@ -1 +1 @@
-/usr/bin/c++   -g   CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders.cpp.o CMakeFiles/ftests.dir/src/jsoncpp.cpp.o  -o ftests 
+/usr/bin/c++   -g   CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o  -o ftests 

cmake-build-debug/Makefile

@@ -150,32 +150,32 @@ examplar.cpp.s:
 	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/examplar.cpp.s
 .PHONY : examplar.cpp.s
 
-src/jsoncpp.o: src/jsoncpp.cpp.o
+src/json/jsoncpp.o: src/json/jsoncpp.cpp.o
 
-.PHONY : src/jsoncpp.o
+.PHONY : src/json/jsoncpp.o
 
 # target to build an object file
-src/jsoncpp.cpp.o:
-	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/jsoncpp.cpp.o
-.PHONY : src/jsoncpp.cpp.o
+src/json/jsoncpp.cpp.o:
+	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
+.PHONY : src/json/jsoncpp.cpp.o
 
-src/jsoncpp.i: src/jsoncpp.cpp.i
+src/json/jsoncpp.i: src/json/jsoncpp.cpp.i
 
-.PHONY : src/jsoncpp.i
+.PHONY : src/json/jsoncpp.i
 
 # target to preprocess a source file
-src/jsoncpp.cpp.i:
-	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/jsoncpp.cpp.i
-.PHONY : src/jsoncpp.cpp.i
+src/json/jsoncpp.cpp.i:
+	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.i
+.PHONY : src/json/jsoncpp.cpp.i
 
-src/jsoncpp.s: src/jsoncpp.cpp.s
+src/json/jsoncpp.s: src/json/jsoncpp.cpp.s
 
-.PHONY : src/jsoncpp.s
+.PHONY : src/json/jsoncpp.s
 
 # target to generate assembly for a file
-src/jsoncpp.cpp.s:
-	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/jsoncpp.cpp.s
-.PHONY : src/jsoncpp.cpp.s
+src/json/jsoncpp.cpp.s:
+	$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.s
+.PHONY : src/json/jsoncpp.cpp.s
 
 src/loaders.o: src/loaders.cpp.o
 
@@ -216,9 +216,9 @@ help:
 	@echo "... examplar.o"
 	@echo "... examplar.i"
 	@echo "... examplar.s"
-	@echo "... src/jsoncpp.o"
-	@echo "... src/jsoncpp.i"
-	@echo "... src/jsoncpp.s"
+	@echo "... src/json/jsoncpp.o"
+	@echo "... src/json/jsoncpp.i"
+	@echo "... src/json/jsoncpp.s"
 	@echo "... src/loaders.o"
 	@echo "... src/loaders.i"
 	@echo "... src/loaders.s"

cmake-build-debug/ftests.cbp

@@ -87,7 +87,7 @@
       <Unit filename="/home/phanes/Development/internal/ftests/examplar.cpp">
          <Option target="ftests"/>
       </Unit>
-      <Unit filename="/home/phanes/Development/internal/ftests/src/jsoncpp.cpp">
+      <Unit filename="/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp">
          <Option target="ftests"/>
       </Unit>
       <Unit filename="/home/phanes/Development/internal/ftests/src/loaders.cpp">