setting up the new structure, all broken for the time being