Reorganize modules into directories