[TASK] Remaking the folder structure