refactor files into folders
refactor popup with angular
merge