Manually merged half-features branch with newer restructured hierarchy.