rename Folder to reflect naming conventions
setup.py updated