Add is_universal() method; move to subdirectory
Finish package