Moving classes out of misc folder