folder and modules reorganization