Change in file hierarchy, main.py, new commands