Fixing requires for application and converting stores from singletons to instances