Separate TODO; move code in src/