Test/fix filetype checker in addItem method
MINOR: Clean up storage classes
Simply constructors to take only a File