Update: update build/* and adjust directory struct