add build systems, tweak layout