Clean-up source tree and revise TODO