restructure of django app for the better, simplified and neatened