Revert "Making changes to the structure"

This reverts commit a0a80eef1be6350a17e6f655a97208abf6ac4ddd.