Added Singleton and RuleBook singleton
refactored folders