Big cleanup of pre- block structured/angularjs approach. Changes in python modules.