Cleaned up annotations, cleaned up imports.
Started work on image uploading classes.