Tidy file structure.
Fix Create_Draws
Combine to long form