Move proposal to it's own module