And add log, which was lost when splitting functions (which made this fix needed)
Use setup.py, subfolder for code.