Improved scoping part 2
Move active merchant files under lib