Added collections + Tests, Refactored php\file