cleaned up organization with apps, fixed enum so they would be accessible by clients of the class