moved files up out of pub and sub dirs