Cleanup up files and added gui library