Move code to its rightful spots