Hotfix/afom

Moved AFOM code to its own app. What is left is the integration of that app in our code base.