Fill-up some "TODO"
New file layout