Restructure for flask dev