Reorganized Package structure and cleaned Project