Files moved to their place in the namespace
Merge pull request #64 from Duikmeester/master

Files moved to their place in the namespace