Revert "Fix files"

This reverts commit 4d012b77a7d2ae9ae2e1f36ddd959da760162056.
Merge branch 'Server'
Test
Merge branch 'Server'
TC status