cvs: restructure code to be more modular