Started spec restructuring