Wikitude Refactoring