New Code Organization

Added 2 shortcodes.