Restructuring stuff.
Merge https://github.com/andersekbom/pysl
Restructuring (again).