Break up modules to folders/namespaces
Add payload assert