renamed all modules to fit django conventions