Moving UI into a subdir, adding subdir for the calc service