Refactor the tree, add best organization, add phpunit dependencies