Did a quick refactor of images folder to make it a little more sensible