[TASK][INSTALL] Cleanup folder structure code