Started big refactoring to accomodate ReqJS-BB