Revert "file structure changes"

This reverts commit f4216993f6be8d5623937d59fde356888ea0496f.