fix build and move shit around