Move Collection into attributes directory.
Move tests into respective attributes directory.
Remove .find, use .query instead;

Also, instead of returning the meaningless nil, we return false or raise an exception if the entity cannot be found.