setup: Total refactoring