Seems things are a bit better. Still, more cases are needed and still not perfectly uniform...
Cartesian fixed now
Most of the modules are organized in subfolders. Maybe some big re-organization is needed in the future, but for now I am happy.