Start refactoring shortcodes to their own files
Refactor out parsing logic