Implemented redistration. Switched all modules to dev-master.