Reorganized things.
Removed desktop dependancies