Restructure python app and add more models