Implement staging dir concept