restructure files + enable image uploader