Removed prototype xwl2
Restructuring and cleaning up a bit.