moved some things so that we don't get weird errors with finding assets to load