Fixes and renames: Components to packages, Combinator to DI