Yesterday
Settings code cleanup, renamed the classes and moved everything in the right folders