Move all entry related includes to the entry sub-folder.
Move shortcode related includes to the shortcodes subfolder.