Add server command and tidy up.
Add loader and app to initial config.