Updated files and makefile to match new UI library layout.