Moved core files into package