Updated directory structure to fix imports