Changing back to the old dir-structure
Continuing with the dir-structure