removed distillery (again)
removals, organized and renames