changed class folder structure (organized UI classes)