Refactoring folder organisation and deps