Functionality now works with new structure we came up with. Deleted
obsolete files.