Architecture files re-added
Updated with patch for lexer