Added lib/spec folders for both tasks