Separated API from Mod, other changes