Fix maven imports.
Bug fix (Null if no window was defined).
Adapt grammer class name to filename.