Restructuring of modules and scripts.