add modules. remove features ap1:1 dependancy.