Big changes all across the spectrum.

Now the code is much more organized and includes 2 more services to tidy up