Add new skeleton code, and massively reorganise /everything/