(refactor) Updates schema and moves stub data to new files