Restructuring of base tellstick app