Some more classes and files, most of them still do nothing.