Production module loading with Almond
Merge branch 'feature/almond'

* feature/almond:
  Production module loading with Almond
Several style improvements