Updated to 1.5.1, reorganized everything