Fixed transforms and some refactoring into new module Desk