fixed crisis where classes in __main__ aren't imported correctly
Merge pull request #2412 from twobraids/one_app_constitutional_crisis

No Bug - fixed crisis where classes in __main__ aren't imported correctly