Refactoring tests / changing directory structure.