Reorganized directory structure and corrected tests
Reorganized directory structure
Corrected delete(); Added draw()
Reorganized code