Adding structuring for Solutions 6 - 10

Structure set, need to continue to refactor.