Revert "Update file structure"

This reverts commit e233b65c9dd880daea1ef3b3cbcc1a2c2cc675ad.