Moved core files out