Move files into folders, fix some bugs
Refactoring
Return all primitive types from invocation as corresponding NSNumber