Extract files into tidy directory structure