Finish refactoring mist module