Remove the Fields module, bake it into the core. Start work on the Forms module