Major rebuild and cleanup of everything ;-)
Adds .yaml configuration files