Removed obsolete Build classes and cleanup remnants of reorganization