Add two modules system, wrap all to closure for uglifyjs