Modules structure altered