Rearranging some stuff for new semester