Pull in Block and Creator
add empty Base class and its spec, fix autoloader