refactor of file names, add feature popups.
merge of master