Refactor functions to Autoload
Remove mpc, to prep. for plugin