Refactor: reworking the component dependency graph a bit
removing old file