Update project structure

Fixes #14
Fixes #15