removed all-in-one-place module structure #49