Restructured + added unity