renamed a couple files
big cleaning + self.content can now be an array