Reverted the file rearrangement, since it doesn't work (duh)