moved specs to spec
added content types