Moved stuff out of the Polymer folder