[TASK] Fixed directory structure