refactored armor again
Moved stuff to external repositories