Dev. checkpoint: merged files