Move some parts and add types for school and position