Renameing and relocating stuff to work again