Separated classes into their own file, like a grown-up programmer would.
Fixed compiler errors related to previous commit.