Moved overrides into app as overrides inlined in package mess up dependencies causing package to be excluded.
Use overrides dir instead of overriding classes in app.