Fixed: module name & folder structure