remove namespace; combine view related classes;