Join modules back into a single file

Modular imports made no sense