Reorganizes modules declarations