Update module system

Currently broken core.