Annie/code cleanup and organization#127

applepie7864 merged 16 commits intodevuwblueprint/marillac-place:devfrom

annie/code-cleanup-and-organizationuwblueprint/marillac-place:annie/code-cleanup-and-organizationCopy head branch name to clipboard