[TASK] Refactor Structure