Changed files structure
Revert "Changed files structure"

This reverts commit 2a24fd9a6245304348d76793ef2f6c47c53a2757.