Moved files to new package and added dialog