Reorganize modules structure