Organize python, fix angular