fixes #39
fixes #31
fixes #23
general cleanup of file structure
fixed #13
Merge branch 'master' into 1.0-wip