Merged all images into correct folders

Common images are in plain ing folder.
Closes #17