Improved uc.py structure, broke out data