Added Identifier classes, tweaked directory structure