Updated Ignore file
Made some import adjustments
Made some naming adjustments