reorganized controller to match corresponding methods order
removed test unit folder