trying to make our file structure actually make sense