All functions work with blocks as supposed. Changing structure of project