reorganized for building