Implement new directory structure to prepare for tests