Reorganize and clean up some files
Fix setup.py included files
Clean up classifiers in setup.py
Cleanup after adding tasks.py to the container