reform the project structure to adapt to django merge