merge Jonathan and cleanup repository

This fixes #4 and provides a more comfortable repository layout.