fixed awkward directory naming scheme, now packages in core directory