Remove duplicated code
Eliminate iD.layers
Build data into package
Remove duplicate declaration
Sync tests