changed package structure
refactored manage.py