Removed some unnecessary allocations, renamed std->extra, core->std