Moved core into it's own folder