Cleanup, moved config files to Jacc