Subdirectories

Resolves #81