file restructuring, adding UI