django project structure cleanup; integrate templates