Put Sink in own folder, various improvements