Added popover on hover, organized file structure