Converted to SUBDIRS project and added TestUI project