Simplified controller structure and removed excess folders