updated layout to put test dependencies in the test folder.