Unit testing and file restructuring