complete refactor of the application organisation
complete refactor of the application organisation