Reorganize modules
Formatting