Update TODO and correct folder organization