Changed directory structure and added phpunit.xml