Add LayoutController, change some namespaces, delete useless class