Added support for modules and better installation