Moved from ID3 api to Directory api. ID3 api is broke

Also make a few more generic functions
s/type/instanceof/