Re-structure and document requirements