add favicons, misc reorganization