Redesigning hierarhy initial commit