added devices structure and common device configuration structure; more refactoring