Finish separating base components
begin to migrate static to use the new MVC interface