Moved core code around for new build system