Further cleanup of structure and build config