update
use packages instead of git submodules
clean up start-up