Add makesymlinks script, remove janus' empty folder in favor of git submodules
Resolve conflict?