some refactoring of the folder structure to keep things clean