minor changes, directory refactoring, prepare to create subprojects
Merge branch 'hotfix/#49-runtime-dependency-bug'