Lots of bug fixes :D, moved config and plugin yml files for easier
export