Revert "Files updates"

This reverts commit 3030f0d26dd6c7b70a65fc1ff2c2f25b5cf50c11.
The new idea

With sub-module's