Organize directory structure

Fixes #18