[Target] Refactor file structure