Reorganized, added some imagemagick stuff