Added some modules and re-arranged e-commerce