Improved hierarchy
Added clean script