added new project structure, still to move old logic into new structure
Removed accidental check in
undid further accidental changes
Merged with upstream
Merge pull request #5 from johannesprinz/master

added new project structure, still to move old logic into new structure