Issue #411 Classes moved to component

* Also fixed some DIC stuff