Now that Sirra framework is stable, moving more code to core