Cleanup, allow spaces
Finish recursive module parsing

Includes passing unit tests.