Complited class Collection. Restructured site files