Reorganized a bit, removed generated files.