This should be a complete commit with the new structure. Nearly there now!