Refactoring of the folder structure and naming conventions