moved devices out of core
resources improvement