Merge pull request #2 from KodeIV/natalie

Natalie
unwanted files deleted
Merge pull request #3 from KodeIV/moveFiles

unwanted files deleted
hapi directory DB
some tests and file organisation
new file layout in one file
new layout