re-organized directory structure, testing for jpg uploading fix