Add granular todos, move flux stuff into folders