Initial refactoring complete. Still need to complete adding regenerate thumbnails functionality on postdata and test.