Feature/organize specifications

yep