Reorganization

Reorganized, made units more readable