Folder structure

Naming changes as per issue #86