Move controller types into folder [SERINA-3]