Feature/organize specifications

Assuming IDE tells you to remove things like this when they're unused?