Structure and build cleanup