Cleanup some unfit assumptions in specs
Setup skeleton for library