Modifying index, adding static dirs
fixing the merge