2 Commit (chore/proposed-structure)