Added mootools more dependency + refactoring