[TASK] Cleanup file structure