diff --git a/changehat/libapparmor/AUTHORS b/libraries/libapparmor/AUTHORS
similarity index 100%
rename from changehat/libapparmor/AUTHORS
rename to libraries/libapparmor/AUTHORS
diff --git a/changehat/libapparmor/COPYING.LGPL b/libraries/libapparmor/COPYING.LGPL
similarity index 100%
rename from changehat/libapparmor/COPYING.LGPL
rename to libraries/libapparmor/COPYING.LGPL
diff --git a/changehat/libapparmor/ChangeLog b/libraries/libapparmor/ChangeLog
similarity index 100%
rename from changehat/libapparmor/ChangeLog
rename to libraries/libapparmor/ChangeLog
diff --git a/changehat/libapparmor/INSTALL b/libraries/libapparmor/INSTALL
similarity index 100%
rename from changehat/libapparmor/INSTALL
rename to libraries/libapparmor/INSTALL
diff --git a/changehat/libapparmor/Makefile.am b/libraries/libapparmor/Makefile.am
similarity index 100%
rename from changehat/libapparmor/Makefile.am
rename to libraries/libapparmor/Makefile.am
diff --git a/changehat/libapparmor/NEWS b/libraries/libapparmor/NEWS
similarity index 100%
rename from changehat/libapparmor/NEWS
rename to libraries/libapparmor/NEWS
diff --git a/changehat/libapparmor/README b/libraries/libapparmor/README
similarity index 100%
rename from changehat/libapparmor/README
rename to libraries/libapparmor/README
diff --git a/changehat/libapparmor/autogen.sh b/libraries/libapparmor/autogen.sh
similarity index 100%
rename from changehat/libapparmor/autogen.sh
rename to libraries/libapparmor/autogen.sh
diff --git a/changehat/libapparmor/configure.in b/libraries/libapparmor/configure.in
similarity index 100%
rename from changehat/libapparmor/configure.in
rename to libraries/libapparmor/configure.in
diff --git a/changehat/libapparmor/doc/Makefile.am b/libraries/libapparmor/doc/Makefile.am
similarity index 100%
rename from changehat/libapparmor/doc/Makefile.am
rename to libraries/libapparmor/doc/Makefile.am
diff --git a/changehat/libapparmor/doc/aa_change_hat.pod b/libraries/libapparmor/doc/aa_change_hat.pod
similarity index 100%
rename from changehat/libapparmor/doc/aa_change_hat.pod
rename to libraries/libapparmor/doc/aa_change_hat.pod
diff --git a/changehat/libapparmor/libapparmor1.spec b/libraries/libapparmor/libapparmor1.spec
similarity index 100%
rename from changehat/libapparmor/libapparmor1.spec
rename to libraries/libapparmor/libapparmor1.spec
diff --git a/changehat/libapparmor/m4/ac_pod2man.m4 b/libraries/libapparmor/m4/ac_pod2man.m4
similarity index 100%
rename from changehat/libapparmor/m4/ac_pod2man.m4
rename to libraries/libapparmor/m4/ac_pod2man.m4
diff --git a/changehat/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4
similarity index 100%
rename from changehat/libapparmor/m4/ac_python_devel.m4
rename to libraries/libapparmor/m4/ac_python_devel.m4
diff --git a/changehat/libapparmor/src/Makefile.am b/libraries/libapparmor/src/Makefile.am
similarity index 100%
rename from changehat/libapparmor/src/Makefile.am
rename to libraries/libapparmor/src/Makefile.am
diff --git a/changehat/libapparmor/src/aalogparse.h b/libraries/libapparmor/src/aalogparse.h
similarity index 100%
rename from changehat/libapparmor/src/aalogparse.h
rename to libraries/libapparmor/src/aalogparse.h
diff --git a/changehat/libapparmor/src/apparmor.h b/libraries/libapparmor/src/apparmor.h
similarity index 100%
rename from changehat/libapparmor/src/apparmor.h
rename to libraries/libapparmor/src/apparmor.h
diff --git a/changehat/libapparmor/src/change_hat.c b/libraries/libapparmor/src/change_hat.c
similarity index 100%
rename from changehat/libapparmor/src/change_hat.c
rename to libraries/libapparmor/src/change_hat.c
diff --git a/changehat/libapparmor/src/grammar.y b/libraries/libapparmor/src/grammar.y
similarity index 100%
rename from changehat/libapparmor/src/grammar.y
rename to libraries/libapparmor/src/grammar.y
diff --git a/changehat/libapparmor/src/libaalogparse.c b/libraries/libapparmor/src/libaalogparse.c
similarity index 100%
rename from changehat/libapparmor/src/libaalogparse.c
rename to libraries/libapparmor/src/libaalogparse.c
diff --git a/changehat/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
similarity index 100%
rename from changehat/libapparmor/src/libapparmor.map
rename to libraries/libapparmor/src/libapparmor.map
diff --git a/changehat/libapparmor/src/libimmunix_warning.c b/libraries/libapparmor/src/libimmunix_warning.c
similarity index 100%
rename from changehat/libapparmor/src/libimmunix_warning.c
rename to libraries/libapparmor/src/libimmunix_warning.c
diff --git a/changehat/libapparmor/src/parser.h b/libraries/libapparmor/src/parser.h
similarity index 100%
rename from changehat/libapparmor/src/parser.h
rename to libraries/libapparmor/src/parser.h
diff --git a/changehat/libapparmor/src/scanner.l b/libraries/libapparmor/src/scanner.l
similarity index 100%
rename from changehat/libapparmor/src/scanner.l
rename to libraries/libapparmor/src/scanner.l
diff --git a/changehat/libapparmor/src/tst_aalogmisc.c b/libraries/libapparmor/src/tst_aalogmisc.c
similarity index 100%
rename from changehat/libapparmor/src/tst_aalogmisc.c
rename to libraries/libapparmor/src/tst_aalogmisc.c
diff --git a/changehat/libapparmor/swig/Makefile.am b/libraries/libapparmor/swig/Makefile.am
similarity index 100%
rename from changehat/libapparmor/swig/Makefile.am
rename to libraries/libapparmor/swig/Makefile.am
diff --git a/changehat/libapparmor/swig/SWIG/libapparmor.i b/libraries/libapparmor/swig/SWIG/libapparmor.i
similarity index 100%
rename from changehat/libapparmor/swig/SWIG/libapparmor.i
rename to libraries/libapparmor/swig/SWIG/libapparmor.i
diff --git a/changehat/libapparmor/swig/java/Makefile.am b/libraries/libapparmor/swig/java/Makefile.am
similarity index 100%
rename from changehat/libapparmor/swig/java/Makefile.am
rename to libraries/libapparmor/swig/java/Makefile.am
diff --git a/changehat/libapparmor/swig/perl/Makefile.PL b/libraries/libapparmor/swig/perl/Makefile.PL
similarity index 100%
rename from changehat/libapparmor/swig/perl/Makefile.PL
rename to libraries/libapparmor/swig/perl/Makefile.PL
diff --git a/changehat/libapparmor/swig/perl/Makefile.am b/libraries/libapparmor/swig/perl/Makefile.am
similarity index 100%
rename from changehat/libapparmor/swig/perl/Makefile.am
rename to libraries/libapparmor/swig/perl/Makefile.am
diff --git a/changehat/libapparmor/swig/perl/examples/example.pl b/libraries/libapparmor/swig/perl/examples/example.pl
similarity index 100%
rename from changehat/libapparmor/swig/perl/examples/example.pl
rename to libraries/libapparmor/swig/perl/examples/example.pl
diff --git a/changehat/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am
similarity index 100%
rename from changehat/libapparmor/swig/python/Makefile.am
rename to libraries/libapparmor/swig/python/Makefile.am
diff --git a/changehat/libapparmor/swig/ruby/Makefile.am b/libraries/libapparmor/swig/ruby/Makefile.am
similarity index 100%
rename from changehat/libapparmor/swig/ruby/Makefile.am
rename to libraries/libapparmor/swig/ruby/Makefile.am
diff --git a/changehat/libapparmor/swig/ruby/examples/example.rb b/libraries/libapparmor/swig/ruby/examples/example.rb
similarity index 100%
rename from changehat/libapparmor/swig/ruby/examples/example.rb
rename to libraries/libapparmor/swig/ruby/examples/example.rb
diff --git a/changehat/libapparmor/swig/ruby/extconf.rb b/libraries/libapparmor/swig/ruby/extconf.rb
similarity index 100%
rename from changehat/libapparmor/swig/ruby/extconf.rb
rename to libraries/libapparmor/swig/ruby/extconf.rb
diff --git a/changehat/libapparmor/testsuite/Makefile.am b/libraries/libapparmor/testsuite/Makefile.am
similarity index 100%
rename from changehat/libapparmor/testsuite/Makefile.am
rename to libraries/libapparmor/testsuite/Makefile.am
diff --git a/changehat/libapparmor/testsuite/config/Makefile.am b/libraries/libapparmor/testsuite/config/Makefile.am
similarity index 100%
rename from changehat/libapparmor/testsuite/config/Makefile.am
rename to libraries/libapparmor/testsuite/config/Makefile.am
diff --git a/changehat/libapparmor/testsuite/config/default.exp b/libraries/libapparmor/testsuite/config/default.exp
similarity index 100%
rename from changehat/libapparmor/testsuite/config/default.exp
rename to libraries/libapparmor/testsuite/config/default.exp
diff --git a/changehat/libapparmor/testsuite/config/unix.exp b/libraries/libapparmor/testsuite/config/unix.exp
similarity index 100%
rename from changehat/libapparmor/testsuite/config/unix.exp
rename to libraries/libapparmor/testsuite/config/unix.exp
diff --git a/changehat/libapparmor/testsuite/config/unknown.exp b/libraries/libapparmor/testsuite/config/unknown.exp
similarity index 100%
rename from changehat/libapparmor/testsuite/config/unknown.exp
rename to libraries/libapparmor/testsuite/config/unknown.exp
diff --git a/changehat/libapparmor/testsuite/lib/Makefile.am b/libraries/libapparmor/testsuite/lib/Makefile.am
similarity index 100%
rename from changehat/libapparmor/testsuite/lib/Makefile.am
rename to libraries/libapparmor/testsuite/lib/Makefile.am
diff --git a/changehat/libapparmor/testsuite/lib/libaalogparse_init.exp b/libraries/libapparmor/testsuite/lib/libaalogparse_init.exp
similarity index 100%
rename from changehat/libapparmor/testsuite/lib/libaalogparse_init.exp
rename to libraries/libapparmor/testsuite/lib/libaalogparse_init.exp
diff --git a/changehat/libapparmor/testsuite/libaalogparse.test/Makefile.am b/libraries/libapparmor/testsuite/libaalogparse.test/Makefile.am
similarity index 100%
rename from changehat/libapparmor/testsuite/libaalogparse.test/Makefile.am
rename to libraries/libapparmor/testsuite/libaalogparse.test/Makefile.am
diff --git a/changehat/libapparmor/testsuite/libaalogparse.test/multi_test.exp b/libraries/libapparmor/testsuite/libaalogparse.test/multi_test.exp
similarity index 100%
rename from changehat/libapparmor/testsuite/libaalogparse.test/multi_test.exp
rename to libraries/libapparmor/testsuite/libaalogparse.test/multi_test.exp
diff --git a/changehat/libapparmor/testsuite/test_multi.c b/libraries/libapparmor/testsuite/test_multi.c
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi.c
rename to libraries/libapparmor/testsuite/test_multi.c
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase1.err b/libraries/libapparmor/testsuite/test_multi/testcase1.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase1.err
rename to libraries/libapparmor/testsuite/test_multi/testcase1.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase1.in b/libraries/libapparmor/testsuite/test_multi/testcase1.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase1.in
rename to libraries/libapparmor/testsuite/test_multi/testcase1.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase1.out b/libraries/libapparmor/testsuite/test_multi/testcase1.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase1.out
rename to libraries/libapparmor/testsuite/test_multi/testcase1.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase10.err b/libraries/libapparmor/testsuite/test_multi/testcase10.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase10.err
rename to libraries/libapparmor/testsuite/test_multi/testcase10.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase10.in b/libraries/libapparmor/testsuite/test_multi/testcase10.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase10.in
rename to libraries/libapparmor/testsuite/test_multi/testcase10.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase10.out b/libraries/libapparmor/testsuite/test_multi/testcase10.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase10.out
rename to libraries/libapparmor/testsuite/test_multi/testcase10.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase11.err b/libraries/libapparmor/testsuite/test_multi/testcase11.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase11.err
rename to libraries/libapparmor/testsuite/test_multi/testcase11.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase11.in b/libraries/libapparmor/testsuite/test_multi/testcase11.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase11.in
rename to libraries/libapparmor/testsuite/test_multi/testcase11.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase11.out b/libraries/libapparmor/testsuite/test_multi/testcase11.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase11.out
rename to libraries/libapparmor/testsuite/test_multi/testcase11.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase12.err b/libraries/libapparmor/testsuite/test_multi/testcase12.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase12.err
rename to libraries/libapparmor/testsuite/test_multi/testcase12.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase12.in b/libraries/libapparmor/testsuite/test_multi/testcase12.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase12.in
rename to libraries/libapparmor/testsuite/test_multi/testcase12.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase12.out b/libraries/libapparmor/testsuite/test_multi/testcase12.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase12.out
rename to libraries/libapparmor/testsuite/test_multi/testcase12.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase13.err b/libraries/libapparmor/testsuite/test_multi/testcase13.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase13.err
rename to libraries/libapparmor/testsuite/test_multi/testcase13.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase13.in b/libraries/libapparmor/testsuite/test_multi/testcase13.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase13.in
rename to libraries/libapparmor/testsuite/test_multi/testcase13.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase13.out b/libraries/libapparmor/testsuite/test_multi/testcase13.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase13.out
rename to libraries/libapparmor/testsuite/test_multi/testcase13.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase14.err b/libraries/libapparmor/testsuite/test_multi/testcase14.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase14.err
rename to libraries/libapparmor/testsuite/test_multi/testcase14.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase14.in b/libraries/libapparmor/testsuite/test_multi/testcase14.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase14.in
rename to libraries/libapparmor/testsuite/test_multi/testcase14.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase14.out b/libraries/libapparmor/testsuite/test_multi/testcase14.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase14.out
rename to libraries/libapparmor/testsuite/test_multi/testcase14.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase15.err b/libraries/libapparmor/testsuite/test_multi/testcase15.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase15.err
rename to libraries/libapparmor/testsuite/test_multi/testcase15.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase15.in b/libraries/libapparmor/testsuite/test_multi/testcase15.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase15.in
rename to libraries/libapparmor/testsuite/test_multi/testcase15.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase15.out b/libraries/libapparmor/testsuite/test_multi/testcase15.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase15.out
rename to libraries/libapparmor/testsuite/test_multi/testcase15.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase16.err b/libraries/libapparmor/testsuite/test_multi/testcase16.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase16.err
rename to libraries/libapparmor/testsuite/test_multi/testcase16.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase16.in b/libraries/libapparmor/testsuite/test_multi/testcase16.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase16.in
rename to libraries/libapparmor/testsuite/test_multi/testcase16.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase16.out b/libraries/libapparmor/testsuite/test_multi/testcase16.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase16.out
rename to libraries/libapparmor/testsuite/test_multi/testcase16.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase17.err b/libraries/libapparmor/testsuite/test_multi/testcase17.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase17.err
rename to libraries/libapparmor/testsuite/test_multi/testcase17.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase17.in b/libraries/libapparmor/testsuite/test_multi/testcase17.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase17.in
rename to libraries/libapparmor/testsuite/test_multi/testcase17.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase17.out b/libraries/libapparmor/testsuite/test_multi/testcase17.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase17.out
rename to libraries/libapparmor/testsuite/test_multi/testcase17.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase18.err b/libraries/libapparmor/testsuite/test_multi/testcase18.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase18.err
rename to libraries/libapparmor/testsuite/test_multi/testcase18.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase18.in b/libraries/libapparmor/testsuite/test_multi/testcase18.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase18.in
rename to libraries/libapparmor/testsuite/test_multi/testcase18.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase18.out b/libraries/libapparmor/testsuite/test_multi/testcase18.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase18.out
rename to libraries/libapparmor/testsuite/test_multi/testcase18.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase19.err b/libraries/libapparmor/testsuite/test_multi/testcase19.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase19.err
rename to libraries/libapparmor/testsuite/test_multi/testcase19.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase19.in b/libraries/libapparmor/testsuite/test_multi/testcase19.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase19.in
rename to libraries/libapparmor/testsuite/test_multi/testcase19.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase19.out b/libraries/libapparmor/testsuite/test_multi/testcase19.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase19.out
rename to libraries/libapparmor/testsuite/test_multi/testcase19.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase2.err b/libraries/libapparmor/testsuite/test_multi/testcase2.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase2.err
rename to libraries/libapparmor/testsuite/test_multi/testcase2.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase2.in b/libraries/libapparmor/testsuite/test_multi/testcase2.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase2.in
rename to libraries/libapparmor/testsuite/test_multi/testcase2.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase2.out b/libraries/libapparmor/testsuite/test_multi/testcase2.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase2.out
rename to libraries/libapparmor/testsuite/test_multi/testcase2.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase20.err b/libraries/libapparmor/testsuite/test_multi/testcase20.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase20.err
rename to libraries/libapparmor/testsuite/test_multi/testcase20.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase20.in b/libraries/libapparmor/testsuite/test_multi/testcase20.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase20.in
rename to libraries/libapparmor/testsuite/test_multi/testcase20.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase20.out b/libraries/libapparmor/testsuite/test_multi/testcase20.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase20.out
rename to libraries/libapparmor/testsuite/test_multi/testcase20.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase21.err b/libraries/libapparmor/testsuite/test_multi/testcase21.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase21.err
rename to libraries/libapparmor/testsuite/test_multi/testcase21.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase21.in b/libraries/libapparmor/testsuite/test_multi/testcase21.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase21.in
rename to libraries/libapparmor/testsuite/test_multi/testcase21.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase21.out b/libraries/libapparmor/testsuite/test_multi/testcase21.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase21.out
rename to libraries/libapparmor/testsuite/test_multi/testcase21.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase22.err b/libraries/libapparmor/testsuite/test_multi/testcase22.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase22.err
rename to libraries/libapparmor/testsuite/test_multi/testcase22.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase22.in b/libraries/libapparmor/testsuite/test_multi/testcase22.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase22.in
rename to libraries/libapparmor/testsuite/test_multi/testcase22.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase22.out b/libraries/libapparmor/testsuite/test_multi/testcase22.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase22.out
rename to libraries/libapparmor/testsuite/test_multi/testcase22.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase23.in b/libraries/libapparmor/testsuite/test_multi/testcase23.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase23.in
rename to libraries/libapparmor/testsuite/test_multi/testcase23.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase23.out b/libraries/libapparmor/testsuite/test_multi/testcase23.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase23.out
rename to libraries/libapparmor/testsuite/test_multi/testcase23.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase24.err b/libraries/libapparmor/testsuite/test_multi/testcase24.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase24.err
rename to libraries/libapparmor/testsuite/test_multi/testcase24.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase24.in b/libraries/libapparmor/testsuite/test_multi/testcase24.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase24.in
rename to libraries/libapparmor/testsuite/test_multi/testcase24.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase24.out b/libraries/libapparmor/testsuite/test_multi/testcase24.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase24.out
rename to libraries/libapparmor/testsuite/test_multi/testcase24.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase25.err b/libraries/libapparmor/testsuite/test_multi/testcase25.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase25.err
rename to libraries/libapparmor/testsuite/test_multi/testcase25.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase25.in b/libraries/libapparmor/testsuite/test_multi/testcase25.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase25.in
rename to libraries/libapparmor/testsuite/test_multi/testcase25.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase25.out b/libraries/libapparmor/testsuite/test_multi/testcase25.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase25.out
rename to libraries/libapparmor/testsuite/test_multi/testcase25.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase26.err b/libraries/libapparmor/testsuite/test_multi/testcase26.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase26.err
rename to libraries/libapparmor/testsuite/test_multi/testcase26.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase26.in b/libraries/libapparmor/testsuite/test_multi/testcase26.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase26.in
rename to libraries/libapparmor/testsuite/test_multi/testcase26.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase26.out b/libraries/libapparmor/testsuite/test_multi/testcase26.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase26.out
rename to libraries/libapparmor/testsuite/test_multi/testcase26.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase27.err b/libraries/libapparmor/testsuite/test_multi/testcase27.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase27.err
rename to libraries/libapparmor/testsuite/test_multi/testcase27.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase27.in b/libraries/libapparmor/testsuite/test_multi/testcase27.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase27.in
rename to libraries/libapparmor/testsuite/test_multi/testcase27.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase27.out b/libraries/libapparmor/testsuite/test_multi/testcase27.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase27.out
rename to libraries/libapparmor/testsuite/test_multi/testcase27.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase28.err b/libraries/libapparmor/testsuite/test_multi/testcase28.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase28.err
rename to libraries/libapparmor/testsuite/test_multi/testcase28.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase28.in b/libraries/libapparmor/testsuite/test_multi/testcase28.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase28.in
rename to libraries/libapparmor/testsuite/test_multi/testcase28.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase28.out b/libraries/libapparmor/testsuite/test_multi/testcase28.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase28.out
rename to libraries/libapparmor/testsuite/test_multi/testcase28.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase29.err b/libraries/libapparmor/testsuite/test_multi/testcase29.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase29.err
rename to libraries/libapparmor/testsuite/test_multi/testcase29.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase29.in b/libraries/libapparmor/testsuite/test_multi/testcase29.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase29.in
rename to libraries/libapparmor/testsuite/test_multi/testcase29.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase29.out b/libraries/libapparmor/testsuite/test_multi/testcase29.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase29.out
rename to libraries/libapparmor/testsuite/test_multi/testcase29.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase3.err b/libraries/libapparmor/testsuite/test_multi/testcase3.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase3.err
rename to libraries/libapparmor/testsuite/test_multi/testcase3.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase3.in b/libraries/libapparmor/testsuite/test_multi/testcase3.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase3.in
rename to libraries/libapparmor/testsuite/test_multi/testcase3.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase3.out b/libraries/libapparmor/testsuite/test_multi/testcase3.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase3.out
rename to libraries/libapparmor/testsuite/test_multi/testcase3.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase30.err b/libraries/libapparmor/testsuite/test_multi/testcase30.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase30.err
rename to libraries/libapparmor/testsuite/test_multi/testcase30.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase30.in b/libraries/libapparmor/testsuite/test_multi/testcase30.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase30.in
rename to libraries/libapparmor/testsuite/test_multi/testcase30.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase30.out b/libraries/libapparmor/testsuite/test_multi/testcase30.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase30.out
rename to libraries/libapparmor/testsuite/test_multi/testcase30.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase31.err b/libraries/libapparmor/testsuite/test_multi/testcase31.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase31.err
rename to libraries/libapparmor/testsuite/test_multi/testcase31.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase31.in b/libraries/libapparmor/testsuite/test_multi/testcase31.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase31.in
rename to libraries/libapparmor/testsuite/test_multi/testcase31.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase31.out b/libraries/libapparmor/testsuite/test_multi/testcase31.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase31.out
rename to libraries/libapparmor/testsuite/test_multi/testcase31.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase32.err b/libraries/libapparmor/testsuite/test_multi/testcase32.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase32.err
rename to libraries/libapparmor/testsuite/test_multi/testcase32.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase32.in b/libraries/libapparmor/testsuite/test_multi/testcase32.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase32.in
rename to libraries/libapparmor/testsuite/test_multi/testcase32.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase32.out b/libraries/libapparmor/testsuite/test_multi/testcase32.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase32.out
rename to libraries/libapparmor/testsuite/test_multi/testcase32.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase33.in b/libraries/libapparmor/testsuite/test_multi/testcase33.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase33.in
rename to libraries/libapparmor/testsuite/test_multi/testcase33.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase33.out b/libraries/libapparmor/testsuite/test_multi/testcase33.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase33.out
rename to libraries/libapparmor/testsuite/test_multi/testcase33.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase34.err b/libraries/libapparmor/testsuite/test_multi/testcase34.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase34.err
rename to libraries/libapparmor/testsuite/test_multi/testcase34.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase34.in b/libraries/libapparmor/testsuite/test_multi/testcase34.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase34.in
rename to libraries/libapparmor/testsuite/test_multi/testcase34.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase34.out b/libraries/libapparmor/testsuite/test_multi/testcase34.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase34.out
rename to libraries/libapparmor/testsuite/test_multi/testcase34.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase35.err b/libraries/libapparmor/testsuite/test_multi/testcase35.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase35.err
rename to libraries/libapparmor/testsuite/test_multi/testcase35.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase35.in b/libraries/libapparmor/testsuite/test_multi/testcase35.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase35.in
rename to libraries/libapparmor/testsuite/test_multi/testcase35.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase35.out b/libraries/libapparmor/testsuite/test_multi/testcase35.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase35.out
rename to libraries/libapparmor/testsuite/test_multi/testcase35.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase4.err b/libraries/libapparmor/testsuite/test_multi/testcase4.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase4.err
rename to libraries/libapparmor/testsuite/test_multi/testcase4.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase4.in b/libraries/libapparmor/testsuite/test_multi/testcase4.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase4.in
rename to libraries/libapparmor/testsuite/test_multi/testcase4.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase4.out b/libraries/libapparmor/testsuite/test_multi/testcase4.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase4.out
rename to libraries/libapparmor/testsuite/test_multi/testcase4.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase5.err b/libraries/libapparmor/testsuite/test_multi/testcase5.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase5.err
rename to libraries/libapparmor/testsuite/test_multi/testcase5.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase5.in b/libraries/libapparmor/testsuite/test_multi/testcase5.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase5.in
rename to libraries/libapparmor/testsuite/test_multi/testcase5.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase5.out b/libraries/libapparmor/testsuite/test_multi/testcase5.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase5.out
rename to libraries/libapparmor/testsuite/test_multi/testcase5.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase6.err b/libraries/libapparmor/testsuite/test_multi/testcase6.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase6.err
rename to libraries/libapparmor/testsuite/test_multi/testcase6.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase6.in b/libraries/libapparmor/testsuite/test_multi/testcase6.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase6.in
rename to libraries/libapparmor/testsuite/test_multi/testcase6.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase6.out b/libraries/libapparmor/testsuite/test_multi/testcase6.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase6.out
rename to libraries/libapparmor/testsuite/test_multi/testcase6.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase7.err b/libraries/libapparmor/testsuite/test_multi/testcase7.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase7.err
rename to libraries/libapparmor/testsuite/test_multi/testcase7.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase7.in b/libraries/libapparmor/testsuite/test_multi/testcase7.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase7.in
rename to libraries/libapparmor/testsuite/test_multi/testcase7.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase7.out b/libraries/libapparmor/testsuite/test_multi/testcase7.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase7.out
rename to libraries/libapparmor/testsuite/test_multi/testcase7.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase8.err b/libraries/libapparmor/testsuite/test_multi/testcase8.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase8.err
rename to libraries/libapparmor/testsuite/test_multi/testcase8.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase8.in b/libraries/libapparmor/testsuite/test_multi/testcase8.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase8.in
rename to libraries/libapparmor/testsuite/test_multi/testcase8.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase8.out b/libraries/libapparmor/testsuite/test_multi/testcase8.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase8.out
rename to libraries/libapparmor/testsuite/test_multi/testcase8.out
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase9.err b/libraries/libapparmor/testsuite/test_multi/testcase9.err
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase9.err
rename to libraries/libapparmor/testsuite/test_multi/testcase9.err
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase9.in b/libraries/libapparmor/testsuite/test_multi/testcase9.in
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase9.in
rename to libraries/libapparmor/testsuite/test_multi/testcase9.in
diff --git a/changehat/libapparmor/testsuite/test_multi/testcase9.out b/libraries/libapparmor/testsuite/test_multi/testcase9.out
similarity index 100%
rename from changehat/libapparmor/testsuite/test_multi/testcase9.out
rename to libraries/libapparmor/testsuite/test_multi/testcase9.out