Separate module/controller files, tweaks