Re: Revamping the module hierarchy