First rule:
Create a folder under MD and that is where you begin your configuration that will be shared by everywhere. Do not configure anything besides a folder at the MD level. If you need to configure something completely different, you would create another folder at the MD level that is different configuration-wise from your production folder.
You have a small company; you don't have to configure continent>country>city or whatever. Don't bother. Folder configuration is abstract and used to divide administrative domains or regional configuration boundaries. For a smaller company, you can configure everything in one folder and use ap-groups to separate your configuration.
If you are migrating, I would configure everything from scratch on ArubaOs 8.x so you can get the hang of configuration and administration, instead of using a migration tool.... You can always use ap-move from the old to the new infrastructure, as long as ap-groups of the existing aps exist on the new (8.x infrastructure).
Good luck and ask questions here so that others who have experienced it can answer you.