Moved some files, modified setup.py to reflect new location