Merge branch 'cleanup_file_structure'. Fixes #8.