Restructured app to more closely follow django's folder structure