refactor(all) Massive refactoring