Adding headers, fixing tests and separating classes one per file