added new logo, refactored nested classes and removed logo option from company and settings