project cleaned and restructured