cleaning up
adding new directory structure
default define to run in python set in the .py file