Change sructure of packages for controllers