Folder structure

also some bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md