minor fixes & better GUI
moved Prime classes to own package