swapped out the displacement stuff into a single file