Move things around to be more honest
Move whereabouts, fix circular build in run.py