Removed unused Button class
Removed namespacing from class definition's function declarations, for gcc compatibility
Re-arranged some of Jewel class layout