re-structure and add phpunit.xml