Updated file structure to seperate certain classes.
Merge pull request #57 from ADyson/ImageSave_Fix

Image save fix
Merged With Master