Moved some files around and merged from 1.0 branch: