Typo
Move to custom sub dirs to better manage
Use correct module versions in make
Rejig