Removed components, refactored slightly
Add dotsettings