Refactor folder organisation and play a bit with the code