removed subtrees
consolidated repositories to firesuit
Merge branches 'consolidation' and 'master'