Re-structure device folder, add graphics