Allow config method injections, cannot handle dependencies in circles for now.
Small refactor, move classes to more proper package.
Name the test package more specifically