Changing directory structure
so that all modules import correctly