moving namespaces around
updates for bootstrap 3