reverting folder structure
updated paths in phpunit configs