Minor updates
Restructuring GUI library
Working on GUI Library