Added MVC like division, added stub class for settings