[Resolves #20] Remove hard coded dependency wiring for components