feature/refactor(All): Rework entire directory