Added UI Class, Brush Class Stub and some code cleanup