Put files in the right place, fix build-essential fun