Reorg to adjust file structure better to atomic design.