Renames 'dep-factory' to 'system-dependency'. Cleans some code