Renames and cleanup of some of the asset inclues.