folders refactored, upgraded matchmaker to owl-s 1.2