Merge of src and src2 folder