Feature/organize specifications