a little reorganization of the files and modules hierarchy