Moved files into lib. Specs config stuff broken