Pages and images in categories should be moved to category folders

[tuxuser]

^

by @halotroop2288

[halotroop2288]

#38, #39 and #40 could be made into a single task list.
I plan to tackle them all in one PR to make things easier.