Some final code-improvements the assets-folder.
Some file reorganization.
Update some TODO's.