Organize code/specs better