[SRC] Cleanup file structure