Changing folders structure + refactoring names