Begin refactor of NFL specs
Re-organize files