Reoraganise specs