Basic refactoring of some imports and got windmill displaying.