Modified Editor to work with module system. Check!