Move specs, add features and fix composer.jsons