Changing directory structure

Modifying the directory structure for unit testing