refactored package structure. now using Django default