Reorganized classes, improved flexibility of input

Organized the $ related code to the HelperWindow rather than the main
class