Cleaned up the files, proper break off of UU, created search