code and codingstyle updates, module structure updates