Organize things

Closes #1