Reorganize
Move upcs to config dir
Fix ref to upcs.config in new dir