Split modules/classes in fiels (Fixes #1)