updated directories structure to match Cruks convention