Renamed modules and organized some into a single-content folder