Cleaned and restructured project heirarchy