Modules separated and tweaks