Message on empty collection added. Project slightly reorganized.