Could've sworn I squashed this bug already...
Moving files around again.