Restructurisation and code refactoring