Rearranged bundles
Added users controler