Began to put UI & Options into separate package