Finished client and organizer and fix exports