Commit #10 - Reorganizing.