First commit of de complete refactoring of the bunle to fit Universial analytics