updated to latest master and pacakge layout